Skip to content

Commit ddf6db3

Browse files
romtsnclaude
andcommitted
fix(ci): Use pre-release key for Kotlin 2.3.10 Gradle mapping
9.5.0-milestone-5 < 9.5.0 in semver (pre-releases have lower precedence), so use 9.5.0-0 as the map key to ensure milestone versions match. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent d676e04 commit ddf6db3

1 file changed

Lines changed: 1 addition & 7 deletions

File tree

scripts/generate-compat-matrix.main.kts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,11 @@ class GenerateMatrix : CliktCommand() {
8888
}
8989

9090
// TODO: for now this is manual, but we could try get it from Gradle's github in the future
91-
val gradleToGroovy =
92-
mapOf("7.5".toVersion(strict = false) to "1.2", "8.11".toVersion(strict = false) to "1.7.1")
9391
val gradleToKotlin =
9492
mapOf(
9593
"7.5".toVersion(strict = false) to "1.8.20",
9694
"9.0.0".toVersion(strict = false) to "2.1.0",
97-
"9.5.0".toVersion(strict = false) to "2.3.10",
95+
"9.5.0-0".toVersion(strict = false) to "2.3.10",
9896
)
9997
// TODO: make it dynamic too
10098
val kotlinVersion = "2.1.0".toVersion()
@@ -131,10 +129,6 @@ class GenerateMatrix : CliktCommand() {
131129
)
132130
// TODO: if needed we can test against different Java versions
133131
put("java", "17")
134-
val groovy = gradleToGroovy.entries.findLast { finalGradle >= it.key }?.value
135-
if (groovy != null) {
136-
put("groovy", groovy)
137-
}
138132
val kotlin = gradleToKotlin.entries.findLast { finalGradle >= it.key }?.value
139133
if (kotlin != null) {
140134
put("kotlin", kotlin)

0 commit comments

Comments
 (0)