feat!: bump to Gradle 9.5.1 and underlying deps for spring 4 upgrade

Author: meotchwilliams

build.gradle

@@ -6,7 +6,7 @@ plugins {
   id "groovy"
   id "java-gradle-plugin"
   id "maven-publish"
-  id "org.jetbrains.kotlin.jvm" version "2.1.0"
+  id "org.jetbrains.kotlin.jvm" version "2.3.0"
 }
 
 group "com.mx.binks"
@@ -39,7 +39,8 @@ dependencies {
   implementation "com.lordcodes.turtle:turtle:0.7.0" // Provides git and commandline interaction API
 
   testImplementation "org.mockito:mockito-core:[5.0,6.0)"
-  testImplementation "org.spockframework:spock-core:2.4-M6-groovy-3.0"
+  testImplementation "org.spockframework:spock-core:2.4-M6-groovy-4.0"
+  testRuntimeOnly "org.junit.platform:junit-platform-launcher"
 }
 
 test { useJUnitPlatform() }
@@ -58,6 +59,6 @@ gradlePlugin {
 }
 
 wrapper {
-  gradleVersion = "8.14.3"
+  gradleVersion = "9.5.1"
   distributionType = Wrapper.DistributionType.ALL
 }

gradle.lockfile

@@ -1,19 +1,21 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-com.github.spotbugs:spotbugs-annotations:4.9.8=annotationProcessor,compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testAnnotationProcessor,testCompileClasspath,testCompileOnlyDependenciesMetadata
-com.github.spotbugs:spotbugs:4.9.8=spotbugs
+com.github.spotbugs:spotbugs-annotations:4.10.2=spotbugs
+com.github.spotbugs:spotbugs-annotations:4.9.8=annotationProcessor,compileClasspath,compileOnlyDependenciesMetadata,testAnnotationProcessor,testCompileClasspath,testCompileOnlyDependenciesMetadata
+com.github.spotbugs:spotbugs:4.10.2=spotbugs
 com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
 com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testAnnotationProcessor,testCompileClasspath,testCompileOnlyDependenciesMetadata
-com.google.code.gson:gson:2.13.2=spotbugs
-com.google.errorprone:error_prone_annotations:2.41.0=spotbugs
-com.lordcodes.turtle:turtle:0.7.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-commons-io:commons-io:2.20.0=spotbugs
+com.google.code.gson:gson:2.14.0=spotbugs
+com.google.errorprone:error_prone_annotations:2.48.0=spotbugs
+com.lordcodes.turtle:turtle:0.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+commons-io:commons-io:2.21.0=spotbugs
 dev.drewhamilton.poko:poko-annotations-jvm:0.17.1=detekt
 dev.drewhamilton.poko:poko-annotations:0.17.1=detekt
 io.github.davidburstrom.contester:contester-breakpoint:0.2.0=detekt
 io.github.detekt.sarif4k:sarif4k-jvm:0.6.0=detekt
 io.github.detekt.sarif4k:sarif4k:0.6.0=detekt
+io.github.java-diff-utils:java-diff-utils:4.12=kotlinInternalAbiValidation
 io.gitlab.arturbosch.detekt:detekt-api:1.23.8=detekt
 io.gitlab.arturbosch.detekt:detekt-cli:1.23.8=detekt
 io.gitlab.arturbosch.detekt:detekt-core:1.23.8=detekt
@@ -38,73 +40,84 @@ io.gitlab.arturbosch.detekt:detekt-rules:1.23.8=detekt
 io.gitlab.arturbosch.detekt:detekt-tooling:1.23.8=detekt
 io.gitlab.arturbosch.detekt:detekt-utils:1.23.8=detekt
 io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
-jaxen:jaxen:2.0.0=spotbugs
-net.bytebuddy:byte-buddy-agent:1.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
+jaxen:jaxen:2.0.6=spotbugs
+net.bytebuddy:byte-buddy-agent:1.17.7=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testRuntimeClasspath
 net.sf.saxon:Saxon-HE:12.9=spotbugs
-org.apache.bcel:bcel:6.11.0=spotbugs
-org.apache.commons:commons-lang3:3.19.0=spotbugs
-org.apache.commons:commons-text:1.14.0=spotbugs
-org.apache.logging.log4j:log4j-api:2.25.3=spotbugs
-org.apache.logging.log4j:log4j-core:2.25.3=spotbugs
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata
-org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
+org.apache.bcel:bcel:6.12.0=spotbugs
+org.apache.commons:commons-lang3:3.20.0=spotbugs
+org.apache.commons:commons-text:1.15.0=spotbugs
+org.apache.groovy:groovy-bom:4.0.26=testCompileClasspath,testRuntimeClasspath
+org.apache.groovy:groovy:4.0.26=testCompileClasspath,testRuntimeClasspath
+org.apache.logging.log4j:log4j-api:2.26.0=spotbugs
+org.apache.logging.log4j:log4j-core:2.26.0=spotbugs
+org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.dom4j:dom4j:2.2.0=spotbugs
-org.hamcrest:hamcrest:3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt
-org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt
-org.jacoco:org.jacoco.core:0.8.13=jacocoAnt
-org.jacoco:org.jacoco.report:0.8.13=jacocoAnt
+org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
+org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt
+org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.core:0.8.14=jacocoAnt
+org.jacoco:org.jacoco.report:0.8.14=jacocoAnt
 org.jcommander:jcommander:1.85=detekt
-org.jetbrains.intellij.deps:trove4j:1.0.20200330=detekt,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-build-common:2.1.0=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-api:2.1.0=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-impl:2.1.0=kotlinBuildToolsApiClasspath
+org.jetbrains.intellij.deps:trove4j:1.0.20200330=detekt
+org.jetbrains.kotlin:abi-tools-api:2.3.0=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools:2.3.0=kotlinInternalAbiValidation
+org.jetbrains.kotlin:kotlin-build-tools-api:2.3.0=kotlinBuildToolsApiClasspath
+org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.0=kotlinBuildToolsApiClasspath
+org.jetbrains.kotlin:kotlin-build-tools-impl:2.3.0=kotlinBuildToolsApiClasspath
 org.jetbrains.kotlin:kotlin-compiler-embeddable:2.0.21=detekt
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.1.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-compiler-runner:2.1.0=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-daemon-client:2.1.0=kotlinBuildToolsApiClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.3.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-compiler-runner:2.3.0=kotlinBuildToolsApiClasspath
+org.jetbrains.kotlin:kotlin-daemon-client:2.3.0=kotlinBuildToolsApiClasspath
 org.jetbrains.kotlin:kotlin-daemon-embeddable:2.0.21=detekt
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.1.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.1.0=kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.3.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-klib-abi-reader:2.3.0=kotlinInternalAbiValidation
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.3.0=kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.0=kotlinInternalAbiValidation
 org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
 org.jetbrains.kotlin:kotlin-reflect:2.0.21=detekt
 org.jetbrains.kotlin:kotlin-script-runtime:2.0.21=detekt
-org.jetbrains.kotlin:kotlin-script-runtime:2.1.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-scripting-common:2.1.0=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.1.0=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.1.0=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.1.0=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-script-runtime:2.3.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-scripting-common:2.3.0=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.0=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.0=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.0=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
 org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0=detekt
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=detekt
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=detekt
-org.jetbrains.kotlin:kotlin-stdlib:2.1.0=apiDependenciesMetadata,compileClasspath,detekt,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4=detekt,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-stdlib:2.1.0=apiDependenciesMetadata,detekt
+org.jetbrains.kotlin:kotlin-stdlib:2.3.0=compileClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-tooling-core:2.3.0=kotlinBuildToolsApiClasspath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4=detekt
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
 org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.1=detekt
 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.1=detekt
 org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.1=detekt
 org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.1=detekt
 org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1=detekt
-org.jetbrains:annotations:13.0=compileClasspath,detekt,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit:junit-bom:5.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit:junit-bom:5.14.0=annotationProcessor,spotbugs,testAnnotationProcessor
-org.mockito:mockito-core:5.23.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
+org.jetbrains:annotations:13.0=compileClasspath,detekt,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.12.2=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.12.2=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.12.2=testRuntimeClasspath
+org.junit:junit-bom:5.12.2=testCompileClasspath,testRuntimeClasspath
+org.junit:junit-bom:5.14.0=annotationProcessor,testAnnotationProcessor
+org.junit:junit-bom:6.1.0=spotbugs
+org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:3.3=testRuntimeClasspath
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.ow2.asm:asm-analysis:9.9=spotbugs
-org.ow2.asm:asm-commons:9.8=jacocoAnt
-org.ow2.asm:asm-commons:9.9=spotbugs
-org.ow2.asm:asm-tree:9.8=jacocoAnt
-org.ow2.asm:asm-tree:9.9=spotbugs
-org.ow2.asm:asm-util:9.9=spotbugs
-org.ow2.asm:asm:9.8=jacocoAnt
-org.ow2.asm:asm:9.9=spotbugs
-org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j
+org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
+org.ow2.asm:asm-analysis:9.10.1=spotbugs
+org.ow2.asm:asm-commons:9.10.1=spotbugs
+org.ow2.asm:asm-commons:9.9=jacocoAnt
+org.ow2.asm:asm-tree:9.10.1=spotbugs
+org.ow2.asm:asm-tree:9.9=jacocoAnt
+org.ow2.asm:asm-util:9.10.1=spotbugs
+org.ow2.asm:asm:9.10.1=spotbugs
+org.ow2.asm:asm:9.9=jacocoAnt
+org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j
+org.slf4j:slf4j-api:2.0.18=spotbugs
 org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
 org.snakeyaml:snakeyaml-engine:2.7=detekt
-org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
+org.spockframework:spock-bom:2.4-M6-groovy-4.0=testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-core:2.4-M6-groovy-4.0=testCompileClasspath,testRuntimeClasspath
 org.xmlresolver:xmlresolver:5.3.3=spotbugs
-empty=detektPlugins,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,spotbugsPlugins,testApiDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
+empty=detektPlugins,implementationDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,spotbugsPlugins,testApiDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions

gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-all.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -10,7 +10,9 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.options.Option
+import org.gradle.work.DisableCachingByDefault
 
+@DisableCachingByDefault
 @Suppress("UnstableApiUsage")
 open class ReleaseTask : DefaultTask() {
   init {

gradlew

@@ -1,20 +1,18 @@
 package com.mx.binks
 
-import org.gradle.internal.impldep.org.junit.Rule
-import org.gradle.internal.impldep.org.junit.rules.TemporaryFolder
 import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.TaskOutcome
 
 import spock.lang.Specification
+import spock.lang.TempDir
 
 class BinksPluginTest extends Specification {
-  @Rule
-  TemporaryFolder testProjectFolder = new TemporaryFolder()
+  @TempDir
+  File testProjectFolder
   File buildFile
 
   def setup() {
-    testProjectFolder.create()
-    buildFile = testProjectFolder.newFile("build.gradle")
+    buildFile = new File(testProjectFolder, "build.gradle")
     buildFile << """
       plugins {
         id 'com.mx.binks'
@@ -26,7 +24,7 @@ class BinksPluginTest extends Specification {
   def "releases"() {
     when:
     def result = GradleRunner.create()
-        .withProjectDir(testProjectFolder.root)
+        .withProjectDir(testProjectFolder)
         .withArguments("release", "--check-only", "--ignore-dirty-tree", "--force")
         .withPluginClasspath()
         .build()