Gradle 9.x support

rpalcolea · rpalcolea · commit dec659d81bb9 · 2025-06-26T10:17:38.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@v1
@@ -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/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ out/
 *.iml
 *.ipr
 *.iws
+.kotlin/
diff --git a/build.gradle b/build.gradle
@@ -16,9 +16,9 @@
 import org.gradle.util.GradleVersion
 
 plugins {
-    id 'com.netflix.nebula.plugin-plugin' version '21.2.2'
+    id 'com.netflix.nebula.plugin-plugin' version '22.0.2'
     id 'com.netflix.nebula.optional-base' version '9.0.0'
-    id "org.jetbrains.kotlin.jvm" version "2.1.0"
+    id "org.jetbrains.kotlin.jvm" version "2.2.0"
     id 'java-gradle-plugin'
 }
 
@@ -106,24 +106,6 @@ tasks.withType(Test).configureEach {
     }
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-idea {
-    project {
-        jdkName = '1.8'
-        languageLevel = '1.8'
-    }
-}
-
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-}
-
 tasks.withType(GenerateModuleMetadata).configureEach {
     suppressedValidationErrors.add('enforced-platform')
 }
diff --git a/gradle.lockfile b/gradle.lockfile
@@ -15,13 +15,13 @@ com.google.guava:guava:20.0=integTestCompileClasspath,integTestRuntimeClasspath,
 com.googlecode.javaewah:JavaEWAH:1.1.12=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.4.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.jcraft:jzlib:1.1.2=integTestRuntimeClasspath,testRuntimeClasspath
-com.netflix.nebula:gradle-contacts-plugin:7.0.1=integTestRuntimeClasspath,testRuntimeClasspath
-com.netflix.nebula:gradle-info-plugin:13.1.0=integTestRuntimeClasspath,testRuntimeClasspath
+com.netflix.nebula:gradle-contacts-plugin:7.0.2=integTestRuntimeClasspath,testRuntimeClasspath
+com.netflix.nebula:gradle-info-plugin:14.0.0=integTestRuntimeClasspath,testRuntimeClasspath
 com.netflix.nebula:nebula-dependencies-comparison:0.2.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.netflix.nebula:nebula-gradle-interop:2.3.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.netflix.nebula:nebula-project-plugin:11.0.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.netflix.nebula:nebula-publishing-plugin:21.0.0=integTestRuntimeClasspath,testRuntimeClasspath
-com.netflix.nebula:nebula-test:10.6.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.netflix.nebula:nebula-gradle-interop:3.0.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.netflix.nebula:nebula-project-plugin:12.0.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.netflix.nebula:nebula-publishing-plugin:21.2.0=integTestRuntimeClasspath,testRuntimeClasspath
+com.netflix.nebula:nebula-test:11.0.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.perforce:p4java:2015.2.1365273=integTestRuntimeClasspath,testRuntimeClasspath
 com.squareup.moshi:moshi:1.12.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.squareup.okio:okio:2.10.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -31,18 +31,18 @@ javax.servlet:javax.servlet-api:3.1.0=integTestCompileClasspath,integTestRuntime
 joda-time:joda-time:2.10=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 junit:junit-dep:4.11=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 junit:junit:4.13.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.java.dev.jna:jna-platform:5.7.0=integTestRuntimeClasspath,testRuntimeClasspath
-net.java.dev.jna:jna:5.7.0=integTestRuntimeClasspath,testRuntimeClasspath
+net.java.dev.jna:jna-platform:5.16.0=integTestRuntimeClasspath,testRuntimeClasspath
+net.java.dev.jna:jna:5.16.0=integTestRuntimeClasspath,testRuntimeClasspath
 net.minidev:accessors-smart:1.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.minidev:json-smart:2.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.sf.jopt-simple:jopt-simple:5.0.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.ajoberstar.grgit:grgit-core:4.1.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.antlr:antlr4-runtime:4.5.1-1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-lang3:3.12.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.groovy:groovy:4.0.4=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpclient:4.5.5=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.httpcomponents:httpcore:4.4.9=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.eclipse.jetty:jetty-continuation:9.2.24.v20180105=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.eclipse.jetty:jetty-http:9.2.24.v20180105=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.eclipse.jetty:jetty-io:9.2.24.v20180105=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -57,17 +57,18 @@ org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r=integTestCompileClasspat
 org.hamcrest:hamcrest-core:1.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:2.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.20=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:2.1.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,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.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.mozilla:rhino:1.7R4=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:2.4=integTestRuntimeClasspath,testRuntimeClasspath
-org.opentest4j:opentest4j:1.2.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.opentest4j:opentest4j:1.3.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.ow2.asm:asm:5.0.4=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:1.7.30=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.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
 org.xmlunit:xmlunit-core:2.5.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.xmlunit:xmlunit-legacy:2.5.1=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/main/groovy/nebula/plugin/dependencylock/DependencyLockTaskConfigurer.groovy b/src/main/groovy/nebula/plugin/dependencylock/DependencyLockTaskConfigurer.groovy
@@ -158,7 +158,7 @@ class DependencyLockTaskConfigurer {
                 //TODO: address Invocation of Task.project at execution time has been deprecated.
                 DeprecationLogger.whileDisabled {
                     SaveLockTask globalSave = project.rootProject.tasks.findByName(SAVE_GLOBAL_LOCK_TASK_NAME) as SaveLockTask
-                    if (globalSave?.outputLock?.exists()) {
+                    if (globalSave && globalSave.outputLock &&  globalSave.outputLock.exists()) {
                         throw new GradleException('Cannot save individual locks when global lock is in place, run deleteGlobalLock task')
                     }
                 }
@@ -276,11 +276,24 @@ class DependencyLockTaskConfigurer {
                             [project.dependencies.create(subproject)]
                         }
                     }.flatten()
+
+
+                    // Create a regular configuration instead of a detached one for Gradle 9.x compatibility
+                    // Use a unique name that doesn't conflict with Gradle's reserved names
                     def subprojectsArray = subprojects.toArray(new Dependency[subprojects.size()])
-                    def conf = project.configurations.detachedConfiguration(subprojectsArray)
-                    project.allprojects.each { it.configurations.add(conf) }
 
-                    [conf] + lockableConfigurations(project, project, extension.configurationNames, extension.skippedConfigurationNamesPrefixes)
+                    List<Configuration> configurations = []
+                    project.allprojects.each { p->
+                        def conf = p.configurations.create("globalLockConfig${System.currentTimeMillis()}") {
+                            canBeConsumed = true
+                            canBeResolved = true
+                            transitive = true
+                        }
+                        conf.dependencies.addAll(subprojectsArray)
+                        configurations.add(conf)
+                    }
+
+                    configurations + lockableConfigurations(project, project, extension.configurationNames, extension.skippedConfigurationNamesPrefixes)
                 }
             }
         }
diff --git a/src/main/groovy/nebula/plugin/dependencylock/DependencyLockWriter.groovy b/src/main/groovy/nebula/plugin/dependencylock/DependencyLockWriter.groovy
@@ -36,7 +36,7 @@ class DependencyLockWriter {
         }
 
         filteredSkippedDeps.each { key, lock ->
-            def configuration = key.configuration.startsWith('detachedConfiguration') ? GLOBAL_LOCK_CONFIG : key.configuration
+            def configuration = key.configuration.startsWith('globalLockConfig') ? GLOBAL_LOCK_CONFIG : key.configuration
             def depMap = result[configuration]["${key.group}:${key.artifact}"]
             if (lock.locked) {
                 depMap['locked'] = lock.locked
diff --git a/src/main/groovy/nebula/plugin/dependencylock/tasks/DiffLockTask.groovy b/src/main/groovy/nebula/plugin/dependencylock/tasks/DiffLockTask.groovy
@@ -37,7 +37,7 @@ class DiffLockTask extends AbstractLockTask {
     @OutputFile
     File diffFile = new File(outputDir, "lockdiff.${this.diffFileExtension()}")
 
-    private String diffFileExtension() {
+    String diffFileExtension() {
         DependencyLockingFeatureFlags.isPathAwareDependencyDiffEnabled() ? "json" : "txt"
     }
 
@@ -68,7 +68,7 @@ class DiffLockTask extends AbstractLockTask {
     }
 
     ConfigurationsSet readLocks(File file) {
-        if (!(file?.exists())) {
+        if (!file || !file.exists()) {
             return new ConfigurationsSet([:])
         }
         def contents = new JsonSlurper().parse(file)
diff --git a/src/main/kotlin/nebula/plugin/dependencylock/DependencyLockPlugin.kt b/src/main/kotlin/nebula/plugin/dependencylock/DependencyLockPlugin.kt
@@ -153,9 +153,9 @@ class DependencyLockPlugin @Inject constructor(val buildFeatures: BuildFeatures)
 
             // We do this twice to catch resolves that happen during build evaluation, and ensure that we clobber configurations made during evaluation
             disableCachingForGenerateLock()
-            project.gradle.taskGraph.whenReady(groovyClosure {
+            project.gradle.taskGraph.whenReady {
                 disableCachingForGenerateLock()
-            })
+            }
 
             project.configurations.all({ conf ->
                 if (lockAfterEvaluating) {
diff --git a/src/main/kotlin/nebula/plugin/dependencylock/gradleInterop.kt b/src/main/kotlin/nebula/plugin/dependencylock/gradleInterop.kt
@@ -11,6 +11,6 @@ inline fun <T> T.groovyClosure(crossinline call: () -> Unit) = object : Closure<
     }
 }
 
-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) }
 
 fun Project.findStringProperty(name: String): String? = if (hasProperty(name)) property(name) as String? else null
diff --git a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginWithCoreSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginWithCoreSpec.groovy
@@ -371,7 +371,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec
         buildFile << """\
             plugins {
                 id 'com.netflix.nebula.dependency-lock'
-                id "org.jetbrains.kotlin.jvm" version "1.8.0"
+                id "org.jetbrains.kotlin.jvm" version "2.2.0"
             }
             repositories {
                 ${mavenrepo.mavenRepositoryBlock}
@@ -436,7 +436,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec
         addSubproject("sub1", """
             plugins {
                 id 'com.netflix.nebula.dependency-lock'
-                id "org.jetbrains.kotlin.jvm" version "1.8.0"
+                id "org.jetbrains.kotlin.jvm" version "2.2.0"
             }
             dependencies {
                 $configuration 'test.nebula:a:1.+'
@@ -489,7 +489,7 @@ buildscript {
             }
             plugins {
                 id 'com.netflix.nebula.dependency-lock'
-                id "com.netflix.nebula.clojure" version "13.0.0"
+                id "com.netflix.nebula.clojure" version "14.2.2"
             }
             
             repositories {
@@ -574,8 +574,8 @@ buildscript {
                 maven { url = 'https://clojars.org/repo' }
                 }
                 dependencies {
-                     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
-                     classpath "com.netflix.nebula:nebula-clojure-plugin:13.0.0"
+                     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0"
+                     classpath "com.netflix.nebula:nebula-clojure-plugin:14.2.2"
                 }
             }
             $plugins
diff --git a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginWithCoreVerifierSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginWithCoreVerifierSpec.groovy
@@ -613,7 +613,7 @@ empty=annotationProcessor,testAnnotationProcessor
                     maven { url = 'https://clojars.org/repo' }
                     }
                     dependencies {
-                        classpath "com.netflix.nebula:nebula-clojure-plugin:13.0.1"
+                        classpath "com.netflix.nebula:nebula-clojure-plugin:14.2.2"
                     }
                 }
                 plugins {
diff --git a/src/test/groovy/nebula/plugin/dependencylock/GlobalLockLauncherSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/GlobalLockLauncherSpec.groovy
@@ -26,7 +26,7 @@ class GlobalLockLauncherSpec extends BaseIntegrationTestKitSpec {
         disableConfigurationCache()
     }
 
-    def 'global lock selective dependency updates'() {
+    def 'global lock selective dependency updates'(){
         def graph = new DependencyGraphBuilder()
                 .addModule('apricot:a:1.0.0')
                 .addModule(new ModuleBuilder('beetroot:b:1.0.0').addDependency('apricot:a:1.0.0').build())

-Original file line number
+Diff line change
 *.iml
 *.ipr
 *.iws
 +.kotlin/
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class DependencyLockWriter {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`filteredSkippedDeps.each { key, lock ->`
`39`		`- def configuration = key.configuration.startsWith('detachedConfiguration') ? GLOBAL_LOCK_CONFIG : key.configuration`
	`39`	`+ def configuration = key.configuration.startsWith('globalLockConfig') ? GLOBAL_LOCK_CONFIG : key.configuration`
`40`	`40`	`def depMap = result[configuration]["${key.group}:${key.artifact}"]`
`41`	`41`	`if (lock.locked) {`
`42`	`42`	`depMap['locked'] = lock.locked`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class DiffLockTask extends AbstractLockTask {`
`37`	`37`	`@OutputFile`
`38`	`38`	`File diffFile = new File(outputDir, "lockdiff.${this.diffFileExtension()}")`
`39`	`39`
`40`		`- private String diffFileExtension() {`
	`40`	`+ String diffFileExtension() {`
`41`	`41`	`DependencyLockingFeatureFlags.isPathAwareDependencyDiffEnabled() ? "json" : "txt"`
`42`	`42`	`}`
`43`	`43`
`@@ -68,7 +68,7 @@ class DiffLockTask extends AbstractLockTask {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`ConfigurationsSet readLocks(File file) {`
`71`		`- if (!(file?.exists())) {`
	`71`	`+ if (!file \|\| !file.exists()) {`
`72`	`72`	`return new ConfigurationsSet([:])`
`73`	`73`	`}`
`74`	`74`	`def contents = new JsonSlurper().parse(file)`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@ inline fun <T> T.groovyClosure(crossinline call: () -> Unit) = object : Closure<`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`
`14`		`-inline fun <U> Any.action(crossinline call: U.() -> Unit) = Action<U> { call(it) }`
	`14`	`+inline fun <U : Any> Any.action(crossinline call: U.() -> Unit) = Action<U> { call(it) }`
`15`	`15`
`16`	`16`	`fun Project.findStringProperty(name: String): String? = if (hasProperty(name)) property(name) as String? else null`