Use semantic Gradle version strings in versions.yaml (#285)

Author: cdsap

README.md

@@ -216,7 +216,7 @@ Gradle used, versions supported:
 ## Versions
 Example output versions.yaml:
 ```yaml
-gradle: GRADLE_9_4_0
+gradle: 9.4.0
 project:
     develocity: 4.1
     jdk: 23

cli/src/main/kotlin/io/github/cdsap/projectgenerator/cli/GenerateVersionsYaml.kt

@@ -10,7 +10,7 @@ class GenerateVersionsYaml {
         val file = File("versions.yaml")
         val versions = Versions()
         val content = """
-            |gradle: ${Gradle.GRADLE_9_4_0}
+            |gradle: ${Gradle.GRADLE_9_4_0.version}
             |project:
             |  develocity: ${versions.project.develocity}
             |  develocityUrl: ${versions.project.develocityUrl}

cli/src/main/kotlin/io/github/cdsap/projectgenerator/cli/Main.kt

@@ -149,7 +149,7 @@ internal fun resolveProjectRootPath(outputDir: String?, language: Language, proj
 }
 
 internal fun resolveGradle(cliGradle: String?, versionsFile: VersionsFile?): Gradle {
-    return cliGradle?.let { Gradle.valueOf(it.uppercase()) }
+    return cliGradle?.let(Gradle::fromValue)
         ?: versionsFile?.gradle
         ?: Gradle.GRADLE_9_4_0
 }

cli/src/main/kotlin/io/github/cdsap/projectgenerator/cli/VersionsParser.kt

@@ -3,9 +3,11 @@ package io.github.cdsap.projectgenerator.cli
 import com.fasterxml.jackson.annotation.JsonSetter
 import com.fasterxml.jackson.annotation.Nulls
 import com.fasterxml.jackson.databind.MapperFeature
+import com.fasterxml.jackson.databind.node.ObjectNode
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
 import com.fasterxml.jackson.module.kotlin.KotlinModule
+import io.github.cdsap.projectgenerator.model.Gradle
 import io.github.cdsap.projectgenerator.model.VersionsFile
 import java.io.File
 
@@ -22,5 +24,18 @@ object VersionsParser {
      * [VersionsFile] keeps plugin list fields nullable so omitted YAML keys can resolve to empty lists
      * instead of inheriting the runtime defaults from [io.github.cdsap.projectgenerator.model.Versions].
      */
-    fun fromFile(file: File): VersionsFile = mapper.readValue(file, VersionsFile::class.java)
+    fun fromFile(file: File): VersionsFile {
+        val tree = mapper.readTree(file)
+        normalizeGradleVersion(tree)
+        return mapper.treeToValue(tree, VersionsFile::class.java)
+    }
+
+    private fun normalizeGradleVersion(tree: com.fasterxml.jackson.databind.JsonNode) {
+        if (tree !is ObjectNode) return
+        val gradleNode = tree.get("gradle") ?: return
+        if (!gradleNode.isTextual) return
+
+        val normalized = Gradle.fromValue(gradleNode.asText()).name
+        tree.put("gradle", normalized)
+    }
 }

cli/src/test/kotlin/io/github/cdsap/projectgenerator/cli/VersionsParserTest.kt

@@ -127,7 +127,19 @@ class VersionsParserTest {
     @Test
     fun `parses gradle from YAML case insensitively`() {
         val yaml = """
-            gradle: gradle_9_3_1
+            gradle: 9.3.1
+        """.trimIndent()
+
+        val file = File(tempDir.toFile(), "versions.yaml").apply { writeText(yaml) }
+        val versionsFile = VersionsParser.fromFile(file)
+
+        assertEquals(Gradle.GRADLE_9_3_1, versionsFile.gradle)
+    }
+
+    @Test
+    fun `parses legacy gradle enum name from YAML for backwards compatibility`() {
+        val yaml = """
+            gradle: GRADLE_9_3_1
         """.trimIndent()
 
         val file = File(tempDir.toFile(), "versions.yaml").apply { writeText(yaml) }

project-generator/src/main/kotlin/io/github/cdsap/projectgenerator/model/Gradle.kt

@@ -1,10 +1,18 @@
 package io.github.cdsap.projectgenerator.model
 
-enum class Gradle {
-    GRADLE_8_14_3,
-    GRADLE_9_1_0,
-    GRADLE_9_2_0,
-    GRADLE_9_3_0,
-    GRADLE_9_3_1,
-    GRADLE_9_4_0
+enum class Gradle(val version: String) {
+    GRADLE_8_14_3("8.14.3"),
+    GRADLE_9_1_0("9.1.0"),
+    GRADLE_9_2_0("9.2.0"),
+    GRADLE_9_3_0("9.3.0"),
+    GRADLE_9_3_1("9.3.1"),
+    GRADLE_9_4_0("9.4.0");
+
+    companion object {
+        fun fromValue(value: String): Gradle {
+            return entries.firstOrNull { it.version == value }
+                ?: entries.firstOrNull { it.name.equals(value, ignoreCase = true) }
+                ?: throw IllegalArgumentException("Unknown Gradle version: $value")
+        }
+    }
 }