Derive Groovy version from implicit (Gradle) dependency

aim42 · Apr 25, 2024 · c95fcf6 · c95fcf6
1 parent 02b74b8
commit c95fcf6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -92,7 +92,7 @@ configure(subprojects) {
     }
 }
 
-def groovyVersion = libs.groovy.bom.get().version
+def groovyVersion = GroovySystem.version
 def groovyVersionMajorMinor = groovyVersion.split('\\.')[0..1] .join('.')
 
 tasks.named("dependencyUpdates").configure {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,12 +1,9 @@
 [versions]
-groovy-version = '3.0.17'
 junit5-version = '5.10.2'
 slf4j-version = '2.0.13'
 
 [libraries]
 commons-validator = 'commons-validator:commons-validator:1.8.0'
-# Use Groovy which corresponds to a Gradle version (of hsc build)
-groovy-bom = { module = 'org.codehaus.groovy:groovy-bom', version.ref = 'groovy-version' }
 jsoup = 'org.jsoup:jsoup:1.17.2'
 junit-vintage = { module = 'org.junit.vintage:junit-vintage-engine', version.ref = 'junit5-version' }
 lombok = 'org.projectlombok:lombok:1.18.32'

diff --git a/htmlSanityCheck-core/build.gradle b/htmlSanityCheck-core/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     testCompileOnly libs.lombok
     testAnnotationProcessor libs.lombok
 
-    testImplementation platform(libs.groovy.bom)
+    testImplementation platform("org.codehaus.groovy:groovy-bom:${GroovySystem.version}")
     testImplementation 'org.codehaus.groovy:groovy-xml'
 }