Gradle 9.x support

rpalcolea · rpalcolea · commit f20322592fdf · 2025-06-24T12:35:27.000-07:00
diff --git a/.github/workflows/nebula.yml b/.github/workflows/nebula.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         # test against latest update of some major Java version(s), as well as specific LTS version(s)
-        java: [8, 17, 21]
+        java: [17, 21]
     name: Gradle Build without Publish
     steps:
       - uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: |
-            8
+            17
             ${{ matrix.java }}
           java-package: jdk
       - uses: actions/cache@v4
@@ -75,7 +75,7 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: |
-            8
+            17
             21
           java-package: jdk
       - uses: actions/cache@v4
@@ -120,7 +120,7 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: |
-            8
+            17
             21
           java-package: jdk
       - uses: actions/cache@v4
diff --git a/build.gradle b/build.gradle
@@ -16,10 +16,10 @@
 
 
 plugins {
-    id 'com.netflix.nebula.plugin-plugin' version '21.3.3'
-    id "org.jetbrains.kotlin.jvm" version "2.1.0"
+    id 'com.netflix.nebula.plugin-plugin' version '22.0.2'
+    id "org.jetbrains.kotlin.jvm" version "2.2.0"
     id 'groovy'
-    id "com.netflix.nebula.integtest" version "10.1.2"
+    id "com.netflix.nebula.integtest" version "11.+"
 }
 
 description 'Test harness for Gradle plugins. Hopefully retiring in favor of Gradle TestKit'
@@ -38,6 +38,7 @@ dependencies {
     testImplementation 'org.mockito:mockito-core:latest.release'
     testImplementation 'com.nhaarman:mockito-kotlin:latest.release'
     testImplementation 'com.natpryce:hamkrest:latest.release'
+    testImplementation 'org.junit.vintage:junit-vintage-engine:5.+'
 }
 
 tasks.withType(Test).configureEach {
diff --git a/gradle.lockfile b/gradle.lockfile
@@ -3,23 +3,25 @@
 # This file is expected to be part of source control.
 cglib:cglib-nodep:3.2.2=integTestRuntimeClasspath,testRuntimeClasspath
 com.natpryce:hamkrest:1.8.0.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.netflix.nebula:nebula-test:10.6.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.netflix.nebula:nebula-test:11.0.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.nhaarman:mockito-kotlin:1.6.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 junit:junit:4.13.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.15.4=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.15.4=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy-agent:1.17.5=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.17.5=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.groovy:groovy:4.0.4=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apiguardian:apiguardian-api:1.1.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy:3.0.12=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest-core:1.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:2.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-reflect:2.1.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:2.1.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-reflect:2.2.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:2.2.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.jetbrains:annotations:13.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.9.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.9.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-core:5.14.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.13.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.13.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.13.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.vintage:junit-vintage-engine:5.13.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.mockito:mockito-core:5.18.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:3.3=integTestRuntimeClasspath,testRuntimeClasspath
-org.opentest4j:opentest4j:1.2.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.3-groovy-3.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-junit4:2.3-groovy-3.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.opentest4j:opentest4j:1.3.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-core:2.3-groovy-4.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-junit4:2.3-groovy-4.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 empty=annotationProcessor,integTestAnnotationProcessor,testAnnotationProcessor
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-rc-1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/integTest/groovy/com/netflix/nebula/interop/DependenciesBuilderWithClassesUnderTest.groovy b/src/integTest/groovy/com/netflix/nebula/interop/DependenciesBuilderWithClassesUnderTest.groovy
@@ -1,9 +1,9 @@
 package com.netflix.nebula.interop
 
+import groovy.json.StringEscapeUtils
 import nebula.test.functional.GradleRunner
 import org.gradle.internal.classloader.ClasspathUtil
 import org.gradle.internal.classpath.ClassPath
-import org.gradle.util.TextUtil
 
 import java.util.function.Predicate
 
@@ -12,7 +12,7 @@ class DependenciesBuilderWithClassesUnderTest {
         ClassLoader classLoader = DependenciesBuilderWithClassesUnderTest.class.getClassLoader()
         def classpathFilter = GradleRunner.CLASSPATH_DEFAULT
         getClasspathAsFiles(classLoader, classpathFilter).collect {
-            String.format("      classpath files('%s')\n", TextUtil.escapeString(it.getAbsolutePath()))
+            String.format("      classpath files('%s')\n", escapeString(it.getAbsolutePath()))
         }.join('\n')
     }
 
@@ -31,4 +31,9 @@ class DependenciesBuilderWithClassesUnderTest {
         }
         throw new IllegalStateException("Unable to extract classpath urls from type ${cp.class.canonicalName}")
     }
+
+    private static String escapeString(Object obj) {
+        return obj == null ? null : StringEscapeUtils.escapeJava(obj.toString());
+    }
+
 }
diff --git a/src/main/kotlin/com/netflix/nebula/interop/actions.kt b/src/main/kotlin/com/netflix/nebula/interop/actions.kt
@@ -17,4 +17,4 @@ inline fun <T> T.groovyClosure(crossinline call: () -> Unit) = object : Closure<
  * An action that provides the receiver as a extension on the argument, allowing the members of the receiver to be used
  * without qualifying with {@code it} or a named lambda argument.
  */
-inline fun <U> Any.action(crossinline call: U.() -> Unit) = Action<U> { call(it) }
+inline fun <U : Any> Any.action(crossinline call: U.() -> Unit) = Action<U> { call(it) }

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`package com.netflix.nebula.interop`
`2`	`2`
	`3`	`+import groovy.json.StringEscapeUtils`
`3`	`4`	`import nebula.test.functional.GradleRunner`
`4`	`5`	`import org.gradle.internal.classloader.ClasspathUtil`
`5`	`6`	`import org.gradle.internal.classpath.ClassPath`
`6`		`-import org.gradle.util.TextUtil`
`7`	`7`
`8`	`8`	`import java.util.function.Predicate`
`9`	`9`
`@@ -12,7 +12,7 @@ class DependenciesBuilderWithClassesUnderTest {`
`12`	`12`	`ClassLoader classLoader = DependenciesBuilderWithClassesUnderTest.class.getClassLoader()`
`13`	`13`	`def classpathFilter = GradleRunner.CLASSPATH_DEFAULT`
`14`	`14`	`getClasspathAsFiles(classLoader, classpathFilter).collect {`
`15`		`- String.format(" classpath files('%s')\n", TextUtil.escapeString(it.getAbsolutePath()))`
	`15`	`+ String.format(" classpath files('%s')\n", escapeString(it.getAbsolutePath()))`
`16`	`16`	`}.join('\n')`
`17`	`17`	`}`
`18`	`18`
`@@ -31,4 +31,9 @@ class DependenciesBuilderWithClassesUnderTest {`
`31`	`31`	`}`
`32`	`32`	`throw new IllegalStateException("Unable to extract classpath urls from type ${cp.class.canonicalName}")`
`33`	`33`	`}`
	`34`	`+`
	`35`	`+ private static String escapeString(Object obj) {`
	`36`	`+ return obj == null ? null : StringEscapeUtils.escapeJava(obj.toString());`
	`37`	`+ }`
	`38`	`+`
`34`	`39`	`}`