Adaptations for Gradle 9

Author: volker

.travis.yml

@@ -6,6 +6,7 @@ env:
   - LIB_GRADLE_VERSION=7.6 DEPLOY=true
   - LIB_GRADLE_VERSION=8.4 DEPLOY=true
   - LIB_GRADLE_VERSION=8.14.2
+  - LIB_GRADLE_VERSION=9.0.0-milestone-9
   global:
     # The next declaration is the encrypted gradlePublishKey
   - secure: tzRoJbjW38G0YcSRuf53+koo/ZixIrA1vHJ9StOfafZOJzKyoASkbFa2EpUKmp3CXBWvUSTVo59j7ywUSyWW+L+G+CRnYqkDTktySJ/LAHjR0CH5dJCUodwcwtZkBje/RQZ//ZuPO2I7wY/aqHfj/E8pg2h9Y+nOd2v9R904/5b5gck9nM1Tr74YE2dJDm3h0QKrMqx6/oT7KVTWQpTNeLxcdrdNn5yxllqn4YDF70gEksoSuJeFR2l5lwSlTTseKI7Q7mGYI1Tg/PSZoxlPz3DGFmSe+9sewRnN9ZnjQDEY06/GmrGQHGv9MV1azvenlFHrt9lIbHnEo0GBqxNpeFfMd4+B9oeEmL8roapNSq0TCgVvOzda/G5KyY8TgLEi+k7WrZaWGvbW+AorU5ntenWEzSWz3b5lpwnwXxrPyyRnaKd3R5mRYj+LL10hlHAiWpvXn+v6ptD2OunE6l3JEm+wln+6wZjJBqBhl1jsv3LOd5siezFGqqOzC6FN6UgkTZqsgMfROzoqklFv3Ko8fU4e6oo9VzI/cJGcFHFO4M+dOHyYZbKl8hfvi1Bf44UpYo914sdwmWGIAZ8J6V2xtCqTnyN1bi/EQuKAkE2400laduCt/rnGyR8IefcM6iFxjufR5jCXpXBhbQ0cQ//pUT0eW4ssjqKvt9RrJmt/Mew=

scripts/javapreprocessor.gradle

@@ -80,8 +80,8 @@ class JPPTask extends DefaultTask {
             def vd = parseDouble(varContent);
             def ld = parseDouble(lit);
             if ( var.toLowerCase().indexOf('version') > 0 ) {
-                vd = VersionNumber.parse(varContent)
-                ld = VersionNumber.parse(lit)
+                vd = project.VersionNumber.parse(varContent)
+                ld = project.VersionNumber.parse(lit)
             }
 
             if (op.equals("=") || op.equals("==")) {

src/com/inet/gradle/setup/abstracts/SetupSources.java

@@ -175,14 +175,13 @@ default CopySpec from( Object... arg0 ) {
         return getRootSpec().from( arg0 );
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /*//if gradleVersion < 9.0
     @Override
     @Internal
     default Integer getDirMode() {
         return getRootSpec().getDirMode();
     }
+    *///endif
 
     /**
      * {@inheritDoc}
@@ -202,14 +201,13 @@ default Set<String> getExcludes() {
         return getRootSpec().getExcludes();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /*//if gradleVersion < 9.0
     @Override
     @Internal
     default Integer getFileMode() {
         return getRootSpec().getFileMode();
     }
+    *///endif
 
     /**
      * {@inheritDoc}
@@ -318,13 +316,12 @@ default void setCaseSensitive( boolean arg0 ) {
         getRootSpec().setCaseSensitive( arg0 );
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /*//if gradleVersion < 9.0
     @Override
     default CopyProcessingSpec setDirMode( Integer arg0 ) {
         return getRootSpec().setDirMode( arg0 );
     }
+    *///endif
 
     /**
      * {@inheritDoc}
@@ -342,13 +339,12 @@ default CopySpec setExcludes( Iterable<String> arg0 ) {
         return getRootSpec().setExcludes( arg0 );
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /*//if gradleVersion < 9.0
     @Override
     default CopyProcessingSpec setFileMode( Integer arg0 ) {
         return getRootSpec().setFileMode( arg0 );
     }
+    *///endif
 
     /**
      * {@inheritDoc}

src/com/inet/gradle/setup/dmg/OSXPrefPaneCreator.java

@@ -58,7 +58,7 @@ protected OSXPrefPaneCreator( Dmg task, SetupBuilder setup, FileResolver fileRes
                 ex.printStackTrace();
                 throw new RuntimeException( ex );
             }
-            gradleBuild.setBuildFile( new File( prefPaneSource, "build.gradle" ) );
+            gradleBuild.setDir( prefPaneSource );
         } );
         gradleBuild.dependsOn( gradleBuildInit );
     }

testBuilds/build.gradle

@@ -5,6 +5,7 @@ buildscript {
         }
     }
     dependencies {
+        apply from: "${buildscript.sourceFile.parentFile.parentFile}/scripts/VersionNumber.gradle"
         apply from: "${buildscript.sourceFile.parentFile.parentFile}/scripts/SetupBuilderVersion.gradle"
         classpath 'de.inetsoftware:SetupBuilder:' + setupBuilderVersion()
     }
@@ -44,8 +45,8 @@ setupBuilder {
     from jar.outputs
 
     bundleJre = 1.8
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
+    java.sourceCompatibility = 1.8
+    java.targetCompatibility = 1.8
     mainClass = 'com.inet.testapplication.TestLauncher'
     mainJar = 'testBuilds.jar'
 
@@ -110,16 +111,17 @@ msi.dependsOn jar
 import org.apache.tools.ant.taskdefs.condition.Os
 task preparePrefPane(type: GradleBuild) {
 
-    buildFile '../../SetupBuilderOSXPrefPane/build.gradle'
+    buildDir = '../../SetupBuilderOSXPrefPane'
     tasks = ['clean', 'uploadArchives']
 
     processResources.dependsOn 'preparePrefPane'
 
     onlyIf {
-        file(buildFile).exists() && Os.isFamily(Os.FAMILY_MAC)
+        file('../../SetupBuilderOSXPrefPane/build.gradle').exists() && Os.isFamily(Os.FAMILY_MAC)
     }
 }
 
+/** buildFile does not exits anymore
 // run the following task as a dependency to the "check"-task.
 task runAppBundlerTest(type: GradleBuild) {
 
@@ -145,3 +147,4 @@ task runJNLPBundlerTest(type: GradleBuild) {
         file(buildFile).exists() && Os.isFamily(Os.FAMILY_MAC)
     }
 }
+*/