Skip to content
This repository was archived by the owner on Sep 1, 2025. It is now read-only.

Commit ee8371f

Browse files
committed
Update dependencies to Java 21 + nextflow 25.01.x
Signed-off-by: Paolo Di Tommaso <[email protected]>
1 parent 4f07101 commit ee8371f

File tree

5 files changed

+13
-20
lines changed

5 files changed

+13
-20
lines changed

buildSrc/src/main/groovy/io.nextflow.groovy-common-conventions.gradle

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,12 @@ repositories {
1313
}
1414

1515
java {
16+
// these settings apply to all jvm tooling, including groovy
1617
toolchain {
1718
languageVersion = JavaLanguageVersion.of(21)
1819
}
19-
}
20-
21-
compileJava {
22-
options.release.set(17)
23-
}
24-
25-
tasks.withType(GroovyCompile) {
26-
sourceCompatibility = '17'
27-
targetCompatibility = '17'
20+
sourceCompatibility = 17
21+
targetCompatibility = 17
2822
}
2923

3024
tasks.withType(Test) {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

plugins/nf-hello/build.gradle

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,20 @@ sourceSets {
5050
}
5151

5252
ext{
53-
nextflowVersion = '24.11.0-edge'
53+
nextflowVersion = '25.01.0-edge'
5454
}
5555

5656
dependencies {
5757
// This dependency is exported to consumers, that is to say found on their compile classpath.
5858
compileOnly "io.nextflow:nextflow:$nextflowVersion"
59-
compileOnly 'org.slf4j:slf4j-api:1.7.10'
60-
compileOnly 'org.pf4j:pf4j:3.4.1'
61-
// add here plugins depepencies
59+
compileOnly 'org.slf4j:slf4j-api:2.0.16'
60+
compileOnly 'org.pf4j:pf4j:3.12.0'
6261

6362
// test configuration
64-
testImplementation "org.apache.groovy:groovy:4.0.18"
65-
testImplementation "org.apache.groovy:groovy-nio:4.0.18"
63+
testImplementation "org.apache.groovy:groovy:4.0.26"
64+
testImplementation "org.apache.groovy:groovy-nio:4.0.26"
6665
testImplementation "io.nextflow:nextflow:$nextflowVersion"
67-
testImplementation ("org.apache.groovy:groovy-test:4.0.18") { exclude group: 'org.apache.groovy' }
66+
testImplementation ("org.apache.groovy:groovy-test:4.0.26") { exclude group: 'org.apache.groovy' }
6867
testImplementation ("cglib:cglib-nodep:3.3.0")
6968
testImplementation ("org.objenesis:objenesis:3.1")
7069
testImplementation ("org.spockframework:spock-core:2.3-groovy-4.0") { exclude group: 'org.apache.groovy'; exclude group: 'net.bytebuddy' }
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Manifest-Version: 1.0
22
Plugin-Id: nf-hello
3-
Plugin-Version: 0.6.0
3+
Plugin-Version: 0.7.0
44
Plugin-Class: nextflow.hello.HelloPlugin
55
Plugin-Provider: nextflow
6-
Plugin-Requires: >=24.11.0-edge
6+
Plugin-Requires: >=25.01.0-edge

plugins/nf-hello/src/test/nextflow/hello/MockHelpers.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,6 @@ class MockTaskHandler extends TaskHandler {
177177
}
178178

179179
@Override
180-
void kill() { }
180+
protected void killTask() { }
181181

182182
}

0 commit comments

Comments
 (0)