#309 Switch to Groovy BOM

aim42 · Jan 24, 2024 · 14b8fbd · 14b8fbd
1 parent 9ffa54b
commit 14b8fbd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -77,6 +77,11 @@ configure(subprojects) {
 
     description "${rootProject.description} - Module ${project.name}"
 
+    dependencies {
+        implementation platform(libs.groovy.bom)
+        implementation 'org.codehaus.groovy:groovy'
+    }
+
     java {
         toolchain {
             languageVersion = JavaLanguageVersion.of(8)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,9 +3,7 @@ groovy-version = "3.0.17"
 
 [libraries]
 # Use Groovy which corresponds to Gradle version (of hsc build)
-groovy-all = { module = "org.codehaus.groovy:groovy-all", version.ref = "groovy-version" }
-# Since Groovy 2.5 it is necessary to import dateutil separately
-groovy-dateutil = { module = "org.codehaus.groovy:groovy-dateutil", version.ref = "groovy-version" }
+groovy-bom = { module = "org.codehaus.groovy:groovy-bom", version.ref = "groovy-version" }
 jsoup = "org.jsoup:jsoup:1.17.2"
 junit = "junit:junit:4.13.2"
 slf4j-api = "org.slf4j:slf4j-simple:2.0.7"

diff --git a/htmlSanityCheck-core/build.gradle b/htmlSanityCheck-core/build.gradle
@@ -9,11 +9,14 @@ dependencies {
 
     // jsoup is our awesome html parser, see jsoup.org
     implementation libs.jsoup
-    implementation libs.groovy.all
-    implementation libs.groovy.dateutil
+    implementation 'org.codehaus.groovy:groovy-xml'
+    // Since Groovy 2.5 it is necessary to import dateutil separately
+    implementation 'org.codehaus.groovy:groovy-dateutil'
+
+    testImplementation 'org.codehaus.groovy:groovy-test'
 }
 
-apply plugin: 'groovy'
+//apply plugin: 'groovy'
 
 tasks.register('copyResourceImages', Copy) {
     from('src/main/resources') {