Account for Gradle 8.10 and later

README.adoc

@@ -1,4 +1,4 @@
-:jbake-version: 1.9.0
+:jbake-version: 1.9.1
 // TODO: Add test for the version above
 = Gradle Plugin Development Toolbox
 

build.gradle

@@ -5,7 +5,7 @@ plugins {
 allprojects {
     group = 'dev.gradleplugins'
 }
-version = '1.9.0'
+version = '1.9.1'
 
 // Configure javadoc
 allprojects {

buildSrc/src/main/groovy/toolboxbuild.publish.gradle

@@ -43,12 +43,14 @@ plugins.withId('java-gradle-plugin') {
     }
 }
 
-signing {
-    sign publishing.publications
-    if (!project.hasProperty('signing.secretKeyRingFile')) {
-        def signingKeyId = findProperty("signing.keyId").toString()
-        def signingKey = findProperty("signing.key").toString()
-        def signingPassword = findProperty("signing.password").toString()
-        useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
-    }
-}
+if (!project.hasProperty('signing.disabled')) {
+	signing {
+		sign publishing.publications
+		if (!project.hasProperty('signing.secretKeyRingFile')) {
+			def signingKeyId = findProperty("signing.keyId").toString()
+			def signingKey = findProperty("signing.key").toString()
+			def signingPassword = findProperty("signing.password").toString()
+			useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
+		}
+	}
+}

subprojects/gradle-plugin-development-test-fixtures/build.gradle

@@ -7,7 +7,7 @@ plugins {
 }
 
 description = 'Gradle plugin development plugins test fixtures.'
-version = '1.9.0'
+version = '1.9.1'
 
 dependencies {
     compileOnly gradleApi(minimumGradleVersion)

subprojects/gradle-plugin-development/README.adoc

@@ -1,4 +1,4 @@
-:jbake-version: 1.9.0
+:jbake-version: 1.9.1
 = Gradle Plugin Development Plugins
 
 The Gradle plugin development plugins are a set of plugins accelerating Gradle plugin development.

subprojects/gradle-plugin-development/build.gradle

@@ -11,7 +11,7 @@ apply plugin: 'dev.gradleplugins.gradle-plugin-unit-test'
 apply plugin: 'dev.gradleplugins.gradle-plugin-functional-test'
 
 description = 'Gradle plugin development plugins.'
-version = '1.9.0'
+version = '1.9.1'
 
 gradlePlugin {
     plugins {

subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/GradleRuntimeCompatibility.java

@@ -126,11 +126,16 @@ private static String groovyVersionOf(VersionNumber gradleVersion) {
             case "8.6":
             case "8.7":
                 return "3.0.17";
-            default:
-                LOGGER.warn(String.format("Unknown Groovy version for Gradle '%s', please open an issue on https://github.com/gradle-plugins/toolbox. Assuming value of the latest known version.", gradleVersion.toString()));
             case "8.8":
             case "8.9":
                 return "3.0.21";
+            default:
+                LOGGER.warn(String.format("Unknown Groovy version for Gradle '%s', please open an issue on https://github.com/gradle-plugins/toolbox. Assuming value of the latest known version.", gradleVersion.toString()));
+            case "8.10":
+            case "8.11":
+            case "8.12":
+            case "8.13":
+                return "3.0.22";
         }
     }
 
@@ -303,10 +308,17 @@ private static Optional<String> kotlinVersionOf(VersionNumber gradleVersion) {
             case "8.7":
             case "8.8":
                 return Optional.of("1.9.22");
-            default:
-                LOGGER.warn(String.format("Unknown Kotlin version for Gradle '%s', please open an issue on https://github.com/gradle-plugins/toolbox. Assuming value of the latest known version.", gradleVersion.toString()));
             case "8.9":
                 return Optional.of("1.9.23");
+            case "8.10":
+                return Optional.of("1.9.24");
+            case "8.11":
+                return Optional.of("2.0.20");
+            default:
+                LOGGER.warn(String.format("Unknown Kotlin version for Gradle '%s', please open an issue on https://github.com/gradle-plugins/toolbox. Assuming value of the latest known version.", gradleVersion.toString()));
+            case "8.12":
+            case "8.13":
+                return Optional.of("2.0.21");
         }
     }
 
@@ -360,6 +372,9 @@ private static String lastPatchedVersionOf(VersionNumber gradleVersion) {
             case "8.0": return "8.0.2";
             case "8.1": return "8.1.1";
             case "8.2": return "8.2.1";
+            case "8.10": return "8.10.2";
+            case "8.11": return "8.11.1";
+            case "8.12": return "8.12.1";
             default:
                 if (gradleVersion.getPatch() == 0) {
                     return String.format("%d.%d%s", gradleVersion.getMajor(), gradleVersion.getMinor(), gradleVersion.getQualifier() == null ? "" : "-" + gradleVersion.getQualifier());
@@ -390,7 +405,7 @@ private static String lastMinorReleaseOf(VersionNumber gradleVersion) {
             case 5: return "5.6.4";
             case 6: return "6.9.4";
             case 7: return "7.6.4";
-            case 8: return "8.9";
+            case 8: return "8.13";
             default:
                 throw new IllegalArgumentException(String.format("Unknown Gradle version, please open an issue on https://github.com/gradle-plugins/toolbox.", gradleVersion));
         }

subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastMinorReleaseOfTests.java

@@ -132,25 +132,33 @@ class GradleRuntimeCompatibilityLastMinorReleaseOfTests {
             "7.5.1              | 7.6.4",
             "6.9.3              | 6.9.4",
             "7.6                | 7.6.4",
-            "8.0                | 8.9",
-            "8.0.1              | 8.9",
+            "8.0                | 8.13",
+            "8.0.1              | 8.13",
             "6.9.4              | 6.9.4",
             "7.6.1              | 7.6.4",
-            "8.0.2              | 8.9",
-            "8.1                | 8.9",
-            "8.1.1              | 8.9",
+            "8.0.2              | 8.13",
+            "8.1                | 8.13",
+            "8.1.1              | 8.13",
             "7.6.4              | 7.6.4",
-            "8.2                | 8.9",
-            "8.2.1              | 8.9",
-            "8.3                | 8.9",
+            "8.2                | 8.13",
+            "8.2.1              | 8.13",
+            "8.3                | 8.13",
             "7.6.3              | 7.6.4",
-            "8.4                | 8.9",
-            "8.5                | 8.9",
-            "8.6                | 8.9",
+            "8.4                | 8.13",
+            "8.5                | 8.13",
+            "8.6                | 8.13",
             "7.6.4              | 7.6.4",
-            "8.7                | 8.9",
-            "8.8                | 8.9",
-            "8.9                | 8.9",
+            "8.7                | 8.13",
+            "8.8                | 8.13",
+            "8.9                | 8.13",
+            "8.10               | 8.13",
+            "8.10.1             | 8.13",
+            "8.10.2             | 8.13",
+            "8.11               | 8.13",
+            "8.11.1             | 8.13",
+            "8.12               | 8.13",
+            "8.12.1             | 8.13",
+            "8.13               | 8.13",
     })
     void checkLastMinorReleasedGradleVersion(String validGradleVersion, String expectedLastMinorGradleVersion) {
         assertThat(lastMinorReleaseOf(validGradleVersion), equalTo(expectedLastMinorGradleVersion));

subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastPatchedVersionOfTests.java

@@ -151,6 +151,14 @@ class GradleRuntimeCompatibilityLastPatchedVersionOfTests {
             "8.7                | 8.7",
             "8.8                | 8.8",
             "8.9                | 8.9",
+            "8.10               | 8.10.2",
+            "8.10.1             | 8.10.2",
+            "8.10.2             | 8.10.2",
+            "8.11               | 8.11.1",
+            "8.11.1             | 8.11.1",
+            "8.12               | 8.12.1",
+            "8.12.1             | 8.12.1",
+            "8.13               | 8.13",
     })
     void checkLastPatchedGradleVersion(String validGradleVersion, String expectedLastPatchedGradleVersion) {
         assertThat(lastPatchedVersionOf(validGradleVersion), equalTo(expectedLastPatchedGradleVersion));