build!: Upgrade to Gradle 9.2.1 (and Kotlin 1.8 making this incompatible with Gradle 7)

Author: Joel Mongård

build.gradle.kts

@@ -78,8 +78,8 @@ tasks.named<KotlinCompile>("compileKotlin") {
         jvmTarget = JvmTarget.JVM_17
 
         // See https://docs.gradle.org/current/userguide/compatibility.html#kotlin.
-        languageVersion = @Suppress("DEPRECATION") KotlinVersion.KOTLIN_1_4
-        apiVersion = @Suppress("DEPRECATION") KotlinVersion.KOTLIN_1_4
+        languageVersion = @Suppress("DEPRECATION") KotlinVersion.KOTLIN_1_8
+        apiVersion = @Suppress("DEPRECATION") KotlinVersion.KOTLIN_1_8
     }
 }
 

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
-assertj = "3.27.3"
+assertj = "3.27.6"
 git-semver-plugin = "0.16.1"
-jgit = "7.3.0.202506031305-r"
-kotlin = "2.0.0"
+jgit = "7.4.0.202509020913-r"
+kotlin = "2.2.0"
 plugin-publish = "1.3.1"
 slf4j = "2.0.17"
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -25,9 +25,10 @@ class GitSemverPluginFunctionalTest {
         @JvmStatic
         fun gradleVersions(): List<Arguments> {
             return listOf(
+//                Arguments.of("9.0.0"),
+                Arguments.of("8.14.3"),
 //                Arguments.of("8.6"),
-                Arguments.of("8.7"),
-                Arguments.of("7.6.4"),
+//                Arguments.of("7.6.4"),
 //                Arguments.of("6.9.4"),
 //                Arguments.of("5.6.4")
             )
@@ -85,24 +86,21 @@ class GitSemverPluginFunctionalTest {
 
     @ParameterizedTest
     @CsvSource(value = [
+        "printChangeLog, added test files",
         "printVersion, \\d+\\.\\d+\\.\\d+",
         "printInfoVersion, \\d+\\.\\d+\\.\\d+-SNAPSHOT\\+\\d{3}",
         "printSemVersion, \\d+\\.\\d+\\.\\d+-SNAPSHOT\\+\\d{3}\\.sha"])
-    fun `can run printVersion task`(printTask: String, pattern: String) {
+    fun `can run print task`(printTask: String, pattern: String) {
         val projectDir = setupTestProject()
 
-        val result = run(projectDir, null, printTask, "-q")
+        val result = run(projectDir, null, printTask, "--configuration-cache",  "-q")
 
         assertThat(result.output).containsPattern(pattern)
-    }
-
-    @Test
-    fun `can run printChangeLog task`() {
-        val projectDir = setupTestProject()
 
-        val result = run(projectDir, null, "printChangeLog", "-q")
+        //Run it again to make sure configuration cache don't break it
+        val result2 = run(projectDir, null, printTask, "--configuration-cache",  "-q")
 
-        assertThat(result.output).containsPattern("added test files")
+        assertThat(result2.output).containsPattern(pattern)
     }
 
     @Test

src/functionalTest/kotlin/git/semver/plugin/gradle/GitSemverPluginFunctionalTest.kt

@@ -16,9 +16,9 @@ class GitSemverPlugin: Plugin<Project> {
     override fun apply(project: Project) {
         val extension = project.extensions.create("semver", GitSemverPluginExtension::class.java, project)
 
-        project.tasks.register("printVersion", PrintTask::class.java, extension::versionValue, "Prints the current project version")
-        project.tasks.register("printSemVersion", PrintTask::class.java, extension::semVersion, "Prints the current project semantic version")
-        project.tasks.register("printInfoVersion", PrintTask::class.java, extension::infoVersion, "Prints the current project info version")
+        project.tasks.register("printVersion", PrintTask::class.java, extension::versionValue, "Prints the current project version", "")
+        project.tasks.register("printSemVersion", PrintTask::class.java, extension::semVersion, "Prints the current project semantic version", "")
+        project.tasks.register("printInfoVersion", PrintTask::class.java, extension::infoVersion, "Prints the current project info version", "")
 
         if (project == project.rootProject) {
             project.tasks.register("printChangeLog", PrintTask::class.java, {
@@ -30,7 +30,7 @@ class GitSemverPlugin: Plugin<Project> {
                     settings,
                     extension.changeLogTexts
                 )
-            }, "Prints a change log")
+            }, "Prints a change log", "Not serializable configuration")
 
             project.tasks.register("releaseVersion", ReleaseTask::class.java, extension)
         }

src/main/kotlin/git/semver/plugin/gradle/GitSemverPlugin.kt

@@ -6,16 +6,16 @@ import git.semver.plugin.semver.SemInfoVersion
 import git.semver.plugin.semver.SemVersion
 import git.semver.plugin.semver.SemverSettings
 import org.gradle.api.Project
-import org.gradle.api.file.Directory
 import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.provider.Provider
+import org.gradle.api.provider.Property
 import org.gradle.api.provider.ProviderFactory
-import org.gradle.api.tasks.Internal
 
 
 abstract class GitSemverPluginExtension(project: Project, providerFactory: ProviderFactory) : BaseSettings() {
     init {
         gitDirectory.convention(project.layout.projectDirectory)
+        createReleaseCommit.convention(true)
+        createReleaseTag.convention(true)
     }
 
     private val defaultPreReleaseProperty = project.findProperty("defaultPreRelease")
@@ -32,14 +32,14 @@ abstract class GitSemverPluginExtension(project: Project, providerFactory: Provi
      * This parameter can be overridden by command line argument to the release task.
      * Default: true.
      */
-    var createReleaseCommit = true
+    abstract val createReleaseCommit: Property<Boolean>
 
     /**
      * Should a release tag be created when running the release task.
      * This parameter can be overridden by command line argument to the release task.
      * Default: true.
      */
-    var createReleaseTag = true
+    abstract val createReleaseTag: Property<Boolean>
 
     /**
      * Format used when producing change log. Used to configure any predefined logging format.
@@ -50,6 +50,7 @@ abstract class GitSemverPluginExtension(project: Project, providerFactory: Provi
      * </ul>
      * The format can also be set using a builder.
      */
+    @Transient
     var changeLogFormat = ChangeLogFormat.defaultChangeLog
 
     /**
@@ -80,6 +81,7 @@ abstract class GitSemverPluginExtension(project: Project, providerFactory: Provi
      * </ul>
      * The text can also be set using a builder.
      */
+    @Transient
     var changeLogTexts: ChangeLogTexts = DefaultChangeLogTexts
 
     /**

src/main/kotlin/git/semver/plugin/gradle/GitSemverPluginExtension.kt

@@ -10,13 +10,16 @@ import javax.inject.Inject
 import kotlin.io.path.createDirectories
 import kotlin.io.path.writeText
 
-open class PrintTask @Inject constructor(private val printout: () -> Any, desc: String) : DefaultTask() {
+open class PrintTask @Inject constructor(private val printout: () -> Any, desc: String, reason: String) : DefaultTask() {
     private var file:String? = null
     private val logger = LoggerFactory.getLogger(PrintTask::class.java)
 
     init {
         group = GitSemverPlugin.VERSIONING_GROUP
         description = desc
+        if (!reason.isEmpty()) {
+            notCompatibleWithConfigurationCache(reason)
+        }
     }
 
     @Option(option = "file", description = "Print to a file ")