From 481b4a1e773d4272bfc313bb6b42cda5335c6f79 Mon Sep 17 00:00:00 2001 From: Daniel Lacasse Date: Wed, 11 Sep 2024 14:56:06 +0100 Subject: [PATCH 1/7] Include runtime compatibilities for Gradle 8.10[.1] Signed-off-by: Daniel Lacasse --- .../GradleRuntimeCompatibility.java | 15 ++++++---- ...eCompatibilityLastMinorReleaseOfTests.java | 30 ++++++++++--------- ...ompatibilityLastPatchedVersionOfTests.java | 2 ++ 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/GradleRuntimeCompatibility.java b/subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/GradleRuntimeCompatibility.java index 2df1a0c..6d0b771 100644 --- a/subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/GradleRuntimeCompatibility.java +++ b/subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/GradleRuntimeCompatibility.java @@ -126,11 +126,13 @@ 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": + return "3.0.22"; } } @@ -303,10 +305,12 @@ private static Optional 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"); + 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.10": + return Optional.of("1.9.24"); } } @@ -360,6 +364,7 @@ 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.1"; default: if (gradleVersion.getPatch() == 0) { return String.format("%d.%d%s", gradleVersion.getMajor(), gradleVersion.getMinor(), gradleVersion.getQualifier() == null ? "" : "-" + gradleVersion.getQualifier()); @@ -390,7 +395,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.10.1"; default: throw new IllegalArgumentException(String.format("Unknown Gradle version, please open an issue on https://github.com/gradle-plugins/toolbox.", gradleVersion)); } diff --git a/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastMinorReleaseOfTests.java b/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastMinorReleaseOfTests.java index 40b4c21..5fccd1f 100644 --- a/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastMinorReleaseOfTests.java +++ b/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastMinorReleaseOfTests.java @@ -132,25 +132,27 @@ 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.10.1", + "8.0.1 | 8.10.1", "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.10.1", + "8.1 | 8.10.1", + "8.1.1 | 8.10.1", "7.6.4 | 7.6.4", - "8.2 | 8.9", - "8.2.1 | 8.9", - "8.3 | 8.9", + "8.2 | 8.10.1", + "8.2.1 | 8.10.1", + "8.3 | 8.10.1", "7.6.3 | 7.6.4", - "8.4 | 8.9", - "8.5 | 8.9", - "8.6 | 8.9", + "8.4 | 8.10.1", + "8.5 | 8.10.1", + "8.6 | 8.10.1", "7.6.4 | 7.6.4", - "8.7 | 8.9", - "8.8 | 8.9", - "8.9 | 8.9", + "8.7 | 8.10.1", + "8.8 | 8.10.1", + "8.9 | 8.10.1", + "8.10 | 8.10.1", + "8.10.1 | 8.10.1", }) void checkLastMinorReleasedGradleVersion(String validGradleVersion, String expectedLastMinorGradleVersion) { assertThat(lastMinorReleaseOf(validGradleVersion), equalTo(expectedLastMinorGradleVersion)); diff --git a/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastPatchedVersionOfTests.java b/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastPatchedVersionOfTests.java index 72c7293..5025d97 100644 --- a/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastPatchedVersionOfTests.java +++ b/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastPatchedVersionOfTests.java @@ -151,6 +151,8 @@ class GradleRuntimeCompatibilityLastPatchedVersionOfTests { "8.7 | 8.7", "8.8 | 8.8", "8.9 | 8.9", + "8.10 | 8.10.1", + "8.10.1 | 8.10.1", }) void checkLastPatchedGradleVersion(String validGradleVersion, String expectedLastPatchedGradleVersion) { assertThat(lastPatchedVersionOf(validGradleVersion), equalTo(expectedLastPatchedGradleVersion)); From 67a1580383384c54177db4f3d11e8308ebb977ad Mon Sep 17 00:00:00 2001 From: Daniel Lacasse Date: Mon, 21 Apr 2025 17:21:23 +0200 Subject: [PATCH 2/7] Allow disabling of signing via Gradle property Signed-off-by: Daniel Lacasse --- .../main/groovy/toolboxbuild.publish.gradle | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/buildSrc/src/main/groovy/toolboxbuild.publish.gradle b/buildSrc/src/main/groovy/toolboxbuild.publish.gradle index 9fa88c4..147dc39 100644 --- a/buildSrc/src/main/groovy/toolboxbuild.publish.gradle +++ b/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) - } -} \ No newline at end of file +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) + } + } +} From 0189bccd9ee1bde55e5fa522a861daf72f8a4d5b Mon Sep 17 00:00:00 2001 From: Daniel Lacasse Date: Mon, 21 Apr 2025 17:29:27 +0200 Subject: [PATCH 3/7] Account for Gradle 8.10.2 Signed-off-by: Daniel Lacasse --- .../GradleRuntimeCompatibility.java | 4 +-- ...eCompatibilityLastMinorReleaseOfTests.java | 33 ++++++++++--------- ...ompatibilityLastPatchedVersionOfTests.java | 5 +-- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/GradleRuntimeCompatibility.java b/subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/GradleRuntimeCompatibility.java index 6d0b771..3f6c819 100644 --- a/subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/GradleRuntimeCompatibility.java +++ b/subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/GradleRuntimeCompatibility.java @@ -364,7 +364,7 @@ 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.1"; + case "8.10": return "8.10.2"; default: if (gradleVersion.getPatch() == 0) { return String.format("%d.%d%s", gradleVersion.getMajor(), gradleVersion.getMinor(), gradleVersion.getQualifier() == null ? "" : "-" + gradleVersion.getQualifier()); @@ -395,7 +395,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.10.1"; + case 8: return "8.10.2"; default: throw new IllegalArgumentException(String.format("Unknown Gradle version, please open an issue on https://github.com/gradle-plugins/toolbox.", gradleVersion)); } diff --git a/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastMinorReleaseOfTests.java b/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastMinorReleaseOfTests.java index 5fccd1f..8fda7eb 100644 --- a/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastMinorReleaseOfTests.java +++ b/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastMinorReleaseOfTests.java @@ -132,27 +132,28 @@ class GradleRuntimeCompatibilityLastMinorReleaseOfTests { "7.5.1 | 7.6.4", "6.9.3 | 6.9.4", "7.6 | 7.6.4", - "8.0 | 8.10.1", - "8.0.1 | 8.10.1", + "8.0 | 8.10.2", + "8.0.1 | 8.10.2", "6.9.4 | 6.9.4", "7.6.1 | 7.6.4", - "8.0.2 | 8.10.1", - "8.1 | 8.10.1", - "8.1.1 | 8.10.1", + "8.0.2 | 8.10.2", + "8.1 | 8.10.2", + "8.1.1 | 8.10.2", "7.6.4 | 7.6.4", - "8.2 | 8.10.1", - "8.2.1 | 8.10.1", - "8.3 | 8.10.1", + "8.2 | 8.10.2", + "8.2.1 | 8.10.2", + "8.3 | 8.10.2", "7.6.3 | 7.6.4", - "8.4 | 8.10.1", - "8.5 | 8.10.1", - "8.6 | 8.10.1", + "8.4 | 8.10.2", + "8.5 | 8.10.2", + "8.6 | 8.10.2", "7.6.4 | 7.6.4", - "8.7 | 8.10.1", - "8.8 | 8.10.1", - "8.9 | 8.10.1", - "8.10 | 8.10.1", - "8.10.1 | 8.10.1", + "8.7 | 8.10.2", + "8.8 | 8.10.2", + "8.9 | 8.10.2", + "8.10 | 8.10.2", + "8.10.1 | 8.10.2", + "8.10.2 | 8.10.2", }) void checkLastMinorReleasedGradleVersion(String validGradleVersion, String expectedLastMinorGradleVersion) { assertThat(lastMinorReleaseOf(validGradleVersion), equalTo(expectedLastMinorGradleVersion)); diff --git a/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastPatchedVersionOfTests.java b/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastPatchedVersionOfTests.java index 5025d97..cfd23eb 100644 --- a/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastPatchedVersionOfTests.java +++ b/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastPatchedVersionOfTests.java @@ -151,8 +151,9 @@ class GradleRuntimeCompatibilityLastPatchedVersionOfTests { "8.7 | 8.7", "8.8 | 8.8", "8.9 | 8.9", - "8.10 | 8.10.1", - "8.10.1 | 8.10.1", + "8.10 | 8.10.2", + "8.10.1 | 8.10.2", + "8.10.2 | 8.10.2", }) void checkLastPatchedGradleVersion(String validGradleVersion, String expectedLastPatchedGradleVersion) { assertThat(lastPatchedVersionOf(validGradleVersion), equalTo(expectedLastPatchedGradleVersion)); From f4dc770527a69ab6b975e7933c2427fe3be5b140 Mon Sep 17 00:00:00 2001 From: Daniel Lacasse Date: Mon, 21 Apr 2025 17:38:41 +0200 Subject: [PATCH 4/7] Account for Gradle 8.11[.1] Signed-off-by: Daniel Lacasse --- .../GradleRuntimeCompatibility.java | 10 ++++-- ...eCompatibilityLastMinorReleaseOfTests.java | 36 ++++++++++--------- ...ompatibilityLastPatchedVersionOfTests.java | 2 ++ 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/GradleRuntimeCompatibility.java b/subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/GradleRuntimeCompatibility.java index 3f6c819..92eeda9 100644 --- a/subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/GradleRuntimeCompatibility.java +++ b/subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/GradleRuntimeCompatibility.java @@ -132,6 +132,7 @@ private static String groovyVersionOf(VersionNumber gradleVersion) { 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": return "3.0.22"; } } @@ -307,10 +308,12 @@ private static Optional kotlinVersionOf(VersionNumber gradleVersion) { return Optional.of("1.9.22"); case "8.9": return Optional.of("1.9.23"); - 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.10": return Optional.of("1.9.24"); + 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.11": + return Optional.of("2.0.20"); } } @@ -365,6 +368,7 @@ private static String lastPatchedVersionOf(VersionNumber gradleVersion) { 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"; default: if (gradleVersion.getPatch() == 0) { return String.format("%d.%d%s", gradleVersion.getMajor(), gradleVersion.getMinor(), gradleVersion.getQualifier() == null ? "" : "-" + gradleVersion.getQualifier()); @@ -395,7 +399,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.10.2"; + case 8: return "8.11.1"; default: throw new IllegalArgumentException(String.format("Unknown Gradle version, please open an issue on https://github.com/gradle-plugins/toolbox.", gradleVersion)); } diff --git a/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastMinorReleaseOfTests.java b/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastMinorReleaseOfTests.java index 8fda7eb..2ed1620 100644 --- a/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastMinorReleaseOfTests.java +++ b/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastMinorReleaseOfTests.java @@ -132,28 +132,30 @@ class GradleRuntimeCompatibilityLastMinorReleaseOfTests { "7.5.1 | 7.6.4", "6.9.3 | 6.9.4", "7.6 | 7.6.4", - "8.0 | 8.10.2", - "8.0.1 | 8.10.2", + "8.0 | 8.11.1", + "8.0.1 | 8.11.1", "6.9.4 | 6.9.4", "7.6.1 | 7.6.4", - "8.0.2 | 8.10.2", - "8.1 | 8.10.2", - "8.1.1 | 8.10.2", + "8.0.2 | 8.11.1", + "8.1 | 8.11.1", + "8.1.1 | 8.11.1", "7.6.4 | 7.6.4", - "8.2 | 8.10.2", - "8.2.1 | 8.10.2", - "8.3 | 8.10.2", + "8.2 | 8.11.1", + "8.2.1 | 8.11.1", + "8.3 | 8.11.1", "7.6.3 | 7.6.4", - "8.4 | 8.10.2", - "8.5 | 8.10.2", - "8.6 | 8.10.2", + "8.4 | 8.11.1", + "8.5 | 8.11.1", + "8.6 | 8.11.1", "7.6.4 | 7.6.4", - "8.7 | 8.10.2", - "8.8 | 8.10.2", - "8.9 | 8.10.2", - "8.10 | 8.10.2", - "8.10.1 | 8.10.2", - "8.10.2 | 8.10.2", + "8.7 | 8.11.1", + "8.8 | 8.11.1", + "8.9 | 8.11.1", + "8.10 | 8.11.1", + "8.10.1 | 8.11.1", + "8.10.2 | 8.11.1", + "8.11 | 8.11.1", + "8.11.1 | 8.11.1", }) void checkLastMinorReleasedGradleVersion(String validGradleVersion, String expectedLastMinorGradleVersion) { assertThat(lastMinorReleaseOf(validGradleVersion), equalTo(expectedLastMinorGradleVersion)); diff --git a/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastPatchedVersionOfTests.java b/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastPatchedVersionOfTests.java index cfd23eb..eeb66e8 100644 --- a/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastPatchedVersionOfTests.java +++ b/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastPatchedVersionOfTests.java @@ -154,6 +154,8 @@ class GradleRuntimeCompatibilityLastPatchedVersionOfTests { "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", }) void checkLastPatchedGradleVersion(String validGradleVersion, String expectedLastPatchedGradleVersion) { assertThat(lastPatchedVersionOf(validGradleVersion), equalTo(expectedLastPatchedGradleVersion)); From 700cce9be74e602acfb2e7362b5ccdc02fc4ebff Mon Sep 17 00:00:00 2001 From: Daniel Lacasse Date: Mon, 21 Apr 2025 17:43:20 +0200 Subject: [PATCH 5/7] Account for Gradle 8.12[.1] Signed-off-by: Daniel Lacasse --- .../GradleRuntimeCompatibility.java | 10 +++-- ...eCompatibilityLastMinorReleaseOfTests.java | 40 ++++++++++--------- ...ompatibilityLastPatchedVersionOfTests.java | 2 + 3 files changed, 30 insertions(+), 22 deletions(-) diff --git a/subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/GradleRuntimeCompatibility.java b/subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/GradleRuntimeCompatibility.java index 92eeda9..b94fd69 100644 --- a/subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/GradleRuntimeCompatibility.java +++ b/subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/GradleRuntimeCompatibility.java @@ -133,6 +133,7 @@ private static String groovyVersionOf(VersionNumber gradleVersion) { 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": return "3.0.22"; } } @@ -310,10 +311,12 @@ private static Optional kotlinVersionOf(VersionNumber gradleVersion) { return Optional.of("1.9.23"); case "8.10": return Optional.of("1.9.24"); - 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.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": + return Optional.of("2.0.21"); } } @@ -369,6 +372,7 @@ private static String lastPatchedVersionOf(VersionNumber gradleVersion) { 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()); @@ -399,7 +403,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.11.1"; + case 8: return "8.12.1"; default: throw new IllegalArgumentException(String.format("Unknown Gradle version, please open an issue on https://github.com/gradle-plugins/toolbox.", gradleVersion)); } diff --git a/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastMinorReleaseOfTests.java b/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastMinorReleaseOfTests.java index 2ed1620..3253122 100644 --- a/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastMinorReleaseOfTests.java +++ b/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastMinorReleaseOfTests.java @@ -132,30 +132,32 @@ class GradleRuntimeCompatibilityLastMinorReleaseOfTests { "7.5.1 | 7.6.4", "6.9.3 | 6.9.4", "7.6 | 7.6.4", - "8.0 | 8.11.1", - "8.0.1 | 8.11.1", + "8.0 | 8.12.1", + "8.0.1 | 8.12.1", "6.9.4 | 6.9.4", "7.6.1 | 7.6.4", - "8.0.2 | 8.11.1", - "8.1 | 8.11.1", - "8.1.1 | 8.11.1", + "8.0.2 | 8.12.1", + "8.1 | 8.12.1", + "8.1.1 | 8.12.1", "7.6.4 | 7.6.4", - "8.2 | 8.11.1", - "8.2.1 | 8.11.1", - "8.3 | 8.11.1", + "8.2 | 8.12.1", + "8.2.1 | 8.12.1", + "8.3 | 8.12.1", "7.6.3 | 7.6.4", - "8.4 | 8.11.1", - "8.5 | 8.11.1", - "8.6 | 8.11.1", + "8.4 | 8.12.1", + "8.5 | 8.12.1", + "8.6 | 8.12.1", "7.6.4 | 7.6.4", - "8.7 | 8.11.1", - "8.8 | 8.11.1", - "8.9 | 8.11.1", - "8.10 | 8.11.1", - "8.10.1 | 8.11.1", - "8.10.2 | 8.11.1", - "8.11 | 8.11.1", - "8.11.1 | 8.11.1", + "8.7 | 8.12.1", + "8.8 | 8.12.1", + "8.9 | 8.12.1", + "8.10 | 8.12.1", + "8.10.1 | 8.12.1", + "8.10.2 | 8.12.1", + "8.11 | 8.12.1", + "8.11.1 | 8.12.1", + "8.12 | 8.12.1", + "8.12.1 | 8.12.1", }) void checkLastMinorReleasedGradleVersion(String validGradleVersion, String expectedLastMinorGradleVersion) { assertThat(lastMinorReleaseOf(validGradleVersion), equalTo(expectedLastMinorGradleVersion)); diff --git a/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastPatchedVersionOfTests.java b/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastPatchedVersionOfTests.java index eeb66e8..7c3b243 100644 --- a/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastPatchedVersionOfTests.java +++ b/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastPatchedVersionOfTests.java @@ -156,6 +156,8 @@ class GradleRuntimeCompatibilityLastPatchedVersionOfTests { "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", }) void checkLastPatchedGradleVersion(String validGradleVersion, String expectedLastPatchedGradleVersion) { assertThat(lastPatchedVersionOf(validGradleVersion), equalTo(expectedLastPatchedGradleVersion)); From 7b8030c7796332b3ac757134edb09ac842a5e536 Mon Sep 17 00:00:00 2001 From: Daniel Lacasse Date: Mon, 21 Apr 2025 17:46:57 +0200 Subject: [PATCH 6/7] Account for Gradle 8.13 Signed-off-by: Daniel Lacasse --- .../GradleRuntimeCompatibility.java | 4 +- ...eCompatibilityLastMinorReleaseOfTests.java | 43 ++++++++++--------- ...ompatibilityLastPatchedVersionOfTests.java | 1 + 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/GradleRuntimeCompatibility.java b/subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/GradleRuntimeCompatibility.java index b94fd69..57a2595 100644 --- a/subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/GradleRuntimeCompatibility.java +++ b/subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/GradleRuntimeCompatibility.java @@ -134,6 +134,7 @@ private static String groovyVersionOf(VersionNumber gradleVersion) { case "8.10": case "8.11": case "8.12": + case "8.13": return "3.0.22"; } } @@ -316,6 +317,7 @@ private static Optional kotlinVersionOf(VersionNumber gradleVersion) { 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"); } } @@ -403,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.12.1"; + 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)); } diff --git a/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastMinorReleaseOfTests.java b/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastMinorReleaseOfTests.java index 3253122..0e3078b 100644 --- a/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastMinorReleaseOfTests.java +++ b/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastMinorReleaseOfTests.java @@ -132,32 +132,33 @@ class GradleRuntimeCompatibilityLastMinorReleaseOfTests { "7.5.1 | 7.6.4", "6.9.3 | 6.9.4", "7.6 | 7.6.4", - "8.0 | 8.12.1", - "8.0.1 | 8.12.1", + "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.12.1", - "8.1 | 8.12.1", - "8.1.1 | 8.12.1", + "8.0.2 | 8.13", + "8.1 | 8.13", + "8.1.1 | 8.13", "7.6.4 | 7.6.4", - "8.2 | 8.12.1", - "8.2.1 | 8.12.1", - "8.3 | 8.12.1", + "8.2 | 8.13", + "8.2.1 | 8.13", + "8.3 | 8.13", "7.6.3 | 7.6.4", - "8.4 | 8.12.1", - "8.5 | 8.12.1", - "8.6 | 8.12.1", + "8.4 | 8.13", + "8.5 | 8.13", + "8.6 | 8.13", "7.6.4 | 7.6.4", - "8.7 | 8.12.1", - "8.8 | 8.12.1", - "8.9 | 8.12.1", - "8.10 | 8.12.1", - "8.10.1 | 8.12.1", - "8.10.2 | 8.12.1", - "8.11 | 8.12.1", - "8.11.1 | 8.12.1", - "8.12 | 8.12.1", - "8.12.1 | 8.12.1", + "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)); diff --git a/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastPatchedVersionOfTests.java b/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastPatchedVersionOfTests.java index 7c3b243..0748343 100644 --- a/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastPatchedVersionOfTests.java +++ b/subprojects/gradle-plugin-development/src/test/groovy/dev/gradleplugins/GradleRuntimeCompatibilityLastPatchedVersionOfTests.java @@ -158,6 +158,7 @@ class GradleRuntimeCompatibilityLastPatchedVersionOfTests { "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)); From 49f1ca7a4990859679435247320ea3ae1ba90c08 Mon Sep 17 00:00:00 2001 From: Daniel Lacasse Date: Mon, 21 Apr 2025 17:49:37 +0200 Subject: [PATCH 7/7] Prepare 1.9.1 Signed-off-by: Daniel Lacasse --- README.adoc | 2 +- build.gradle | 2 +- .../gradle-plugin-development-test-fixtures/build.gradle | 2 +- subprojects/gradle-plugin-development/README.adoc | 2 +- subprojects/gradle-plugin-development/build.gradle | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.adoc b/README.adoc index 4072d6f..0184514 100644 --- a/README.adoc +++ b/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 diff --git a/build.gradle b/build.gradle index 525a9ec..9b5ea59 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { allprojects { group = 'dev.gradleplugins' } -version = '1.9.0' +version = '1.9.1' // Configure javadoc allprojects { diff --git a/subprojects/gradle-plugin-development-test-fixtures/build.gradle b/subprojects/gradle-plugin-development-test-fixtures/build.gradle index 5570421..c1657bb 100644 --- a/subprojects/gradle-plugin-development-test-fixtures/build.gradle +++ b/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) diff --git a/subprojects/gradle-plugin-development/README.adoc b/subprojects/gradle-plugin-development/README.adoc index 06427d4..ec1cb49 100644 --- a/subprojects/gradle-plugin-development/README.adoc +++ b/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. diff --git a/subprojects/gradle-plugin-development/build.gradle b/subprojects/gradle-plugin-development/build.gradle index df300d6..e5294df 100644 --- a/subprojects/gradle-plugin-development/build.gradle +++ b/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 {