groovySource

quiltdata · Dec 22, 2024 · 745410c · 745410c
1 parent f061143
commit 745410c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -39,7 +39,7 @@ if (groovyVer) {
                 force 'org.objenesis:objenesis:3.4'
 
                 // (Optional) If transitive Groovy dependencies cause conflicts
-                force 'org.codehaus.groovy:groovy:3.0.19'
+                force "org.${groovySource}.groovy:groovy-all:$groovyVer"
                 if ((details.requested.group == 'org.codehaus.groovy') && details.requested.version != groovyVer) {
                     if (groovyVer.contains(':')) {
                         details.useTarget(groovyVer)
@@ -99,8 +99,7 @@ allprojects {
 
     dependencies {
         // see https://docs.gradle.org/4.1/userguide/dependency_management.html#sec:module_replacement
-        // implementation 'com.github.groovy-wslite:groovy-wslite:1.1.3'
-        implementation "org.codehaus.groovy:groovy-all:$groovyVersion"
+        implementation "org.${groovySource}.groovy:groovy-all:$groovyVersion"
         implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.2'
         implementation 'com.upplication:s3fs:2.2.2'
 
@@ -109,8 +108,8 @@ allprojects {
         }
         // Documentation required libraries
         groovyDoc 'org.fusesource.jansi:jansi:2.4.1'
-        groovyDoc "org.codehaus.groovy:groovy-groovydoc:$groovyVersion"
-        groovyDoc "org.codehaus.groovy:groovy-ant:$groovyVersion"
+        groovyDoc "org.${groovySource}.groovy:groovy-groovydoc:$groovyVersion"
+        groovyDoc "org.${groovySource}.groovy:groovy-ant:$groovyVersion"
     }
 
     test {

diff --git a/gradle-groovysh-init.gradle b/gradle-groovysh-init.gradle
@@ -13,7 +13,7 @@ gradle.projectsLoaded {
             }
 
             project.dependencies {
-                groovyshdependencies("org.codehaus.groovy:groovy-groovysh:${GroovySystem.version}") {
+                groovyshdependencies("org.${groovySource}.groovy:groovy-groovysh:${GroovySystem.version}") {
                     exclude group: 'org.codehaus.groovy'
                 }
             }
@@ -31,7 +31,7 @@ gradle.projectsLoaded {
                         groovyObjectClassLoader.addURL(file.toURL())
                     }
                     Class.forName('jline.console.history.FileHistory', true, groovyObjectClassLoader)
-                    groovyshClass = Class.forName('org.codehaus.groovy.tools.shell.Groovysh', true, groovyObjectClassLoader)
+                    groovyshClass = Class.forName("org.${groovySource}.groovy.tools.shell.Groovysh", true, groovyObjectClassLoader)
 
                     if (groovyshClass) {
                         groovyShell = groovyshClass.newInstance()

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,6 @@
 nextflowVersion = 24.10.0
 groovyVersion = 4.0.23
+groovyV = groovy-3.0
+groovySource = codehaus
 jdkVersion = 11
 javaLangVersion = 21
diff --git a/groovysh-task.gradle b/groovysh-task.gradle
@@ -21,7 +21,9 @@ gradle.projectsLoaded {
             }
 
             project.dependencies {
-                groovyshdependencies 'org.codehaus.groovy:groovy-groovysh:4.0.24'
+                groovyshdependencies "org.${groovySource}.groovy:groovy-groovysh:$groovyVer" {
+                    exclude group: 'org.codehaus.groovy'
+                }
             }
 
             project.tasks.register('groovysh') {

diff --git a/plugins/nf-quilt/build.gradle b/plugins/nf-quilt/build.gradle
@@ -87,16 +87,16 @@ dependencies {
     // test configuration
     testImplementation "io.nextflow:nextflow:$nextflowVersion"
     // testImplementation "io.nextflow:nf-commons:$nextflowVersion"
-    testImplementation "org.codehaus.groovy:groovy:$groovyVersion"
-    testImplementation "org.codehaus.groovy:groovy-nio:$groovyVersion"
-    testImplementation ("org.codehaus.groovy:groovy-test:$groovyVersion") { exclude group: 'org.codehaus.groovy' }
+    testImplementation "org.${groovySource}.groovy:groovy:$groovyVersion"
+    testImplementation "org.${groovySource}.groovy:groovy-nio:$groovyVersion"
+    testImplementation ("org.${groovySource}.groovy:groovy-test:$groovyVersion") { exclude group: 'org.codehaus.groovy' }
     testImplementation('cglib:cglib-nodep:3.3.0')
     testImplementation('org.objenesis:objenesis:3.4')
-    testImplementation("org.spockframework:spock-core:2.3-groovy-3.0") {
+    testImplementation("org.spockframework:spock-core:2.3-$groovyV") {
         exclude group: 'org.codehaus.groovy'
         exclude group: 'net.bytebuddy'
     }
-    testImplementation("org.spockframework:spock-junit4:2.3-groovy-3.0") {
+    testImplementation("org.spockframework:spock-junit4:2.3-$groovyV") {
         exclude group: 'org.codehaus.groovy'
         exclude group: 'net.bytebuddy'
     }