Merge pull request #45 from nebula-plugins/support-FilePermissions-api

support new Gradle's FilePermissions API

Author: rpalcolea

src/main/groovy/nebula/plugin/clojuresque/tasks/ClojureCompile.groovy

@@ -31,6 +31,7 @@ import org.gradle.api.tasks.StopExecutionException
 import org.gradle.api.tasks.TaskAction
 import org.gradle.internal.execution.history.changes.InputChangesInternal
 import org.gradle.process.ExecOperations
+import org.gradle.util.GradleVersion
 import org.gradle.work.ChangeType
 import org.gradle.work.FileChange
 import org.gradle.work.InputChanges
@@ -143,8 +144,26 @@ abstract class ClojureCompile extends ClojureSourceTask {
 
         if (aotCompile.isPresent() && !aotCompile.get()) {
             fileSystemOperations.copy {
-                dirMode  = this.dirMode
-                fileMode = this.fileMode
+                if(this.dirMode != null) {
+                    if(isOlderThanGradle8_3()) {
+                        dirMode = this.dirMode
+                    } else {
+                        dirPermissions {
+                            unix(this.dirMode)
+                        }
+                    }
+                }
+
+                if(this.fileMode != null) {
+                    if(isOlderThanGradle8_3()) {
+                        fileMode = this.fileMode
+                    } else {
+                        filePermissions {
+                            unix(this.fileMode)
+                        }
+                    }
+                }
+
 
                 from(srcDirs) {
                     include {
@@ -179,4 +198,8 @@ abstract class ClojureCompile extends ClojureSourceTask {
             it.delete()
         }
     }
+
+    private static final isOlderThanGradle8_3() {
+        return GradleVersion.current().baseVersion < GradleVersion.version('8.3').baseVersion
+    }
 }

src/main/groovy/nebula/plugin/utils/tasks/ConfigureUtil.groovy

@@ -6,6 +6,9 @@ package nebula.plugin.utils.tasks
  * @author Meikel Brandmeyer
  */
 class ConfigureUtil {
+
+    public static final int DELEGATE_FIRST = 1
+
     /**
      * Configures the <code>target</code> object. It sets it as the delegate
      * of the <code>configureFn</code> closure and calls the latter. Passes
@@ -19,7 +22,7 @@ class ConfigureUtil {
     static configure(Object target, Closure configureFn={}) {
         def fn = configureFn.clone()
 
-        fn.resolveStrategy = Closure.DELEGATE_FIRST
+        fn.resolveStrategy = DELEGATE_FIRST
         fn.delegate        = target
 
         if (fn.maximumNumberOfParameters == 0)

src/test/groovy/nebula/plugin/clojure/TestFilteringSpec.groovy

@@ -131,7 +131,7 @@ class TestFilteringSpec extends BaseIntegrationTestKitSpec {
         def result = runTasks('test', '--tests', 'HelloWorldTest')
 
         then:
-        result.output.contains('nebula.HelloWorldTest > doesSomething PASSED')
+        result.output.contains('HelloWorldTest > doesSomething PASSED')
         result.output.contains('> Task :clojureTest SKIPPED')
     }
 
@@ -145,7 +145,7 @@ class TestFilteringSpec extends BaseIntegrationTestKitSpec {
         then:
         result.output.contains("Testing test.nebula.test1")
         result.output.contains("Testing test.nebula.test2")
-        result.output.contains('nebula.HelloWorldTest > doesSomething PASSED')
+        result.output.contains('HelloWorldTest > doesSomething PASSED')
     }
 
     private void addJavaProjectSetup() {