force groovySource

quiltdata · Dec 22, 2024 · 2f4445d · 2f4445d
1 parent c6b3331
commit 2f4445d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -40,7 +40,7 @@ if (groovyVer) {
 
                 // (Optional) If transitive Groovy dependencies cause conflicts
                 force "org.${groovySource}.groovy:groovy-all:$groovyVer"
-                if ((details.requested.group == 'org.codehaus.groovy') && details.requested.version != groovyVer) {
+                if ((details.requested.group == "org.${groovySource}.groovy") && details.requested.version != groovyVer) {
                     if (groovyVer.contains(':')) {
                         details.useTarget(groovyVer)
                     }
@@ -91,6 +91,8 @@ allprojects {
         // see https://docs.gradle.org/4.1/userguide/dependency_management.html#sub:exclude_transitive_dependencies
         all*.exclude group: 'org.codehaus.groovy', module: 'groovy-all'
         all*.exclude group: 'org.codehaus.groovy', module: 'groovy-cli-picocli'
+        all*.exclude group: 'org.apache.groovy', module: 'groovy-all'
+        all*.exclude group: 'org.apache.groovy', module: 'groovy-cli-picocli'
         // groovydoc libs
         groovyDoc.extendsFrom runtime
     }

diff --git a/gradle-groovysh-init.gradle b/gradle-groovysh-init.gradle
@@ -14,7 +14,7 @@ gradle.projectsLoaded {
 
             project.dependencies {
                 groovyshdependencies("org.${groovySource}.groovy:groovy-groovysh:${GroovySystem.version}") {
-                    exclude group: 'org.codehaus.groovy'
+                    exclude group: "org.${groovySource}.groovy"
                 }
             }
 

diff --git a/groovysh-task.gradle b/groovysh-task.gradle
@@ -6,7 +6,7 @@ gradle.projectsLoaded {
                     // To be able to load org.codehaus.groovy:groovy-groovysh and dependencies
                     mavenCentral {
                         content {
-                            includeGroup 'org.codehaus.groovy'
+                            includeGroup "org.${groovySource}.groovy"
                             includeGroup 'jline'
                             includeGroup 'com.github.javaparser'
                             includeGroup 'org.ow2.asm'
@@ -22,7 +22,7 @@ gradle.projectsLoaded {
 
             project.dependencies {
                 groovyshdependencies "org.${groovySource}.groovy:groovy-groovysh:$groovyVer" {
-                    exclude group: 'org.codehaus.groovy'
+                    exclude group: "org.${groovySource}.groovy"
                 }
             }
 
@@ -37,7 +37,7 @@ gradle.projectsLoaded {
 
                     def groovyshClass
                     def groovyShell
-                    groovyshClass = Class.forName('org.codehaus.groovy.groovysh.Groovysh', true, groovyshClassLoader)
+                    groovyshClass = Class.forName("org.${groovySource}.groovy.groovysh.Groovysh", true, groovyshClassLoader)
                     if (groovyshClass) {
                         groovyShell = groovyshClass.newInstance()
                         if (groovyShell) {

diff --git a/plugins/nf-quilt/build.gradle b/plugins/nf-quilt/build.gradle
@@ -72,33 +72,25 @@ dependencies {
 
     // This dependency is exported to consumers, that is to say found on their compile classpath.
     compileOnly "io.nextflow:nextflow:$nextflowVersion"
-    // compileOnly "io.nextflow:nf-commons:$nextflowVersion"
     compileOnly 'org.slf4j:slf4j-api:2.1.0-alpha1'
-    compileOnly 'org.pf4j:pf4j:3.13.0'
-    // add here plugins depepencies
-    // compileOnly 'org.slf4j:slf4j-simple:2.1.0-alpha1'
-    // compileOnly 'black.ninia:jep:4.2.2'
-    // runtime 'black.ninia:jep:4.2.2'
+    compileOnly 'org.pf4j:pf4j:3.12.0'
     runtimeOnly 'org.junit.platform:junit-platform-launcher:1.11.3'
     implementation 'commons-io:commons-io:2.17.0'
-    // implementation 'black.ninia:jep:4.2.2'
-    // testImplementation 'black.ninia:jep:4.2.2'
-    //testImplementation(testFixtures('black.ninia:jep:4.0.3'))
 
     // test configuration
     testImplementation "io.nextflow:nextflow:$nextflowVersion"
     // testImplementation "io.nextflow:nf-commons:$nextflowVersion"
     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 ("org.${groovySource}.groovy:groovy-test:$groovyVersion") { exclude group: "org.${groovySource}.groovy" }
     testImplementation('cglib:cglib-nodep:3.3.0')
     testImplementation('org.objenesis:objenesis:3.4')
     testImplementation("org.spockframework:spock-core:2.3-$groovyV") {
-        exclude group: 'org.codehaus.groovy'
+        exclude group: "org.${groovySource}.groovy"
         exclude group: 'net.bytebuddy'
     }
     testImplementation("org.spockframework:spock-junit4:2.3-$groovyV") {
-        exclude group: 'org.codehaus.groovy'
+        exclude group: "org.${groovySource}.groovy"
         exclude group: 'net.bytebuddy'
     }
     testImplementation('com.google.jimfs:jimfs:1.3.0')