Merge pull request #46 from CherryPerry/windows-check

Windows support

Author: CherryPerry

.github/workflows/build.yml

@@ -6,7 +6,10 @@ on:
   pull_request:
 jobs:
   build:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ ubuntu-latest, windows-latest ]
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2

build.gradle.kts

@@ -55,7 +55,7 @@ repositories {
 }
 
 dependencies {
-    implementation("org.eclipse.jgit", "org.eclipse.jgit", "5.13.0.202109080827-r")
+    implementation("org.eclipse.jgit", "org.eclipse.jgit", "6.1.0.202203080745-r")
     compileOnly(gradleApi())
     testImplementation("junit", "junit", "4.13.2")
     testImplementation(gradleTestKit())

src/main/kotlin/com/cherryperry/gfe/CheckGitIgnoreTask.kt

@@ -13,6 +13,7 @@ import org.gradle.api.file.FileCollection
 import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.SkipWhenEmpty
 import org.gradle.api.tasks.TaskAction
+import java.io.File
 import java.io.IOException
 
 /**
@@ -40,32 +41,33 @@ open class CheckGitIgnoreTask : BaseTask(), PlainFilesAware {
         } catch (exception: IOException) {
             throw GradleException("Git repository was not found at path $projectDir", exception)
         }
-        val plainFiles = plainFiles.mapNotNull { it.toRelativeString(projectDir.asFile) }.toHashSet()
+        val plainFiles = plainFiles.toHashSet()
         TreeWalk(git.repository).use { treeWalk -> walkThrough(git, treeWalk, plainFiles) }
         failTaskIfAnyFilesLeft(plainFiles)
     }
 
-    private fun walkThrough(git: Git, treeWalk: TreeWalk, plainFiles: MutableCollection<String>) {
+    private fun walkThrough(git: Git, treeWalk: TreeWalk, plainFiles: MutableCollection<File>) {
         val fileTreeIterator = FileTreeIterator(git.repository)
         fileTreeIterator.setWalkIgnoredDirectories(true)
         treeWalk.addTree(fileTreeIterator)
         treeWalk.isRecursive = true
         while (treeWalk.next() && plainFiles.isNotEmpty()) {
             if (treeWalk.getTree(WorkingTreeIterator::class.java).isEntryIgnored) {
-                val path = treeWalk.pathString
-                val removed = plainFiles.remove(path)
+                val file = projectDir.file(treeWalk.pathString).asFile
+                val removed = plainFiles.remove(file)
                 if (removed) {
-                    logger.info("$path is ignored")
+                    logger.info("$file is ignored")
                 }
             }
         }
     }
 
-    private fun failTaskIfAnyFilesLeft(relativePlainFiles: Collection<String>) {
+    private fun failTaskIfAnyFilesLeft(relativePlainFiles: Collection<File>) {
         if (relativePlainFiles.isNotEmpty()) {
             relativePlainFiles.forEach { plainFile ->
+                val fileForLog = plainFile.relativeToOrNull(projectDir.asFile) ?: plainFile
                 logger.error(
-                    "${projectDir.file(plainFile)} is not ignored by any ${Constants.DOT_GIT_IGNORE} files of project"
+                    "$fileForLog is not ignored by any ${Constants.DOT_GIT_IGNORE} files of project"
                 )
             }
             throw GradleException("Some plain files are not ignored by git, see log above")

src/test/kotlin/com/cherryperry/gfe/FileEncryptPluginFunctionalTest.kt

@@ -41,11 +41,12 @@ class FileEncryptPluginFunctionalTest(
         @Parameterized.Parameters(name = "Gradle version: {0}")
         fun gradleVersions(): Collection<Array<Any>> = arrayListOf(
             arrayOf<Any>("6.8.3"),
-            arrayOf<Any>("6.9.1"),
+            arrayOf<Any>("6.9.2"),
             arrayOf<Any>("7.0.2"),
             arrayOf<Any>("7.1.1"),
             arrayOf<Any>("7.2"),
-            arrayOf<Any>("7.3"),
+            arrayOf<Any>("7.3.3"),
+            arrayOf<Any>("7.4.2"),
         )
     }