Skip to content

Commit

Permalink
groovyVer
Browse files Browse the repository at this point in the history
  • Loading branch information
drernie committed Dec 6, 2024
1 parent 6de394d commit b8ae03c
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 59 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
24.09.2-edge
24.10.0
8 changes: 5 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,12 @@ allprojects {
groovyDoc.extendsFrom runtime
}

groovyVer= '3.0.23'

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:3.0.23'
implementation "org.codehaus.groovy:groovy-all:${groovyVer}"
implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.1'
implementation 'com.upplication:s3fs:2.2.2'

Expand All @@ -108,8 +110,8 @@ allprojects {
}
// Documentation required libraries
groovyDoc 'org.fusesource.jansi:jansi:2.4.1'
groovyDoc 'org.codehaus.groovy:groovy-groovydoc:3.0.23'
groovyDoc 'org.codehaus.groovy:groovy-ant:3.0.23'
groovyDoc "org.codehaus.groovy:groovy-groovydoc:${groovyVer}"
groovyDoc "org.codehaus.groovy:groovy-ant:${groovyVer}"
}

test {
Expand Down
52 changes: 0 additions & 52 deletions groovysh-task.gradle

This file was deleted.

8 changes: 5 additions & 3 deletions plugins/nf-quilt/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,10 @@ sourceSets {

ext {
nextflowVersion = rootProject.file('VERSION').text.trim()
groovyVer = '3.0.23'
}


dependencies {
// quiltcore
implementation 'com.quiltdata:quiltcore:0.1.5'
Expand All @@ -92,10 +94,10 @@ dependencies {
//testImplementation(testFixtures('black.ninia:jep:4.0.3'))

// test configuration
testImplementation 'org.codehaus.groovy:groovy:3.0.23'
testImplementation 'org.codehaus.groovy:groovy-nio:3.0.23'
testImplementation "org.codehaus.groovy:groovy:$groovyVer"
testImplementation "org.codehaus.groovy:groovy-nio:$groovyVer"
testImplementation "io.nextflow:nextflow:$nextflowVersion"
testImplementation('org.codehaus.groovy:groovy-test:3.0.23') { exclude group: 'org.codehaus.groovy' }
testImplementation("org.codehaus.groovy:groovy-test:$groovyVer") { 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') { exclude group: 'org.codehaus.groovy'; exclude group: 'net.bytebuddy' }
Expand Down

0 comments on commit b8ae03c

Please sign in to comment.