Skip to content

Commit f31bfb9

Browse files
Apply changes from nf-hello
Signed-off-by: Lehmann_Fabian <fabian.lehmann@informatik.hu-berlin.de>
1 parent ea40158 commit f31bfb9

File tree

3 files changed

+9
-16
lines changed

3 files changed

+9
-16
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-cws/build.gradle

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,14 @@ ext{
4040
dependencies {
4141
// This dependency is exported to consumers, that is to say found on their compile classpath.
4242
compileOnly "io.nextflow:nextflow:$nextflowVersion"
43-
compileOnly 'org.slf4j:slf4j-api:1.7.10'
44-
compileOnly 'org.pf4j:pf4j:3.4.1'
45-
// add here plugins depepencies
43+
compileOnly 'org.slf4j:slf4j-api:2.0.16'
44+
compileOnly 'org.pf4j:pf4j:3.12.0'
4645

4746
// test configuration
48-
testImplementation "org.apache.groovy:groovy:4.0.18"
49-
testImplementation "org.apache.groovy:groovy-nio:4.0.18"
47+
testImplementation "org.apache.groovy:groovy:4.0.26"
48+
testImplementation "org.apache.groovy:groovy-nio:4.0.26"
5049
testImplementation "io.nextflow:nextflow:$nextflowVersion"
51-
testImplementation ("org.apache.groovy:groovy-test:4.0.18") { exclude group: 'org.apache.groovy' }
50+
testImplementation ("org.apache.groovy:groovy-test:4.0.26") { exclude group: 'org.apache.groovy' }
5251
testImplementation ("cglib:cglib-nodep:3.3.0")
5352
testImplementation ("org.objenesis:objenesis:3.1")
5453
testImplementation ("org.spockframework:spock-core:2.3-groovy-4.0") { exclude group: 'org.apache.groovy'; exclude group: 'net.bytebuddy' }

0 commit comments

Comments
 (0)