From 6e6e30d3240ed5656d10cd038ee86f4a24bf35b5 Mon Sep 17 00:00:00 2001 From: Tom Sellman Date: Thu, 5 Dec 2024 15:51:35 +0000 Subject: [PATCH] Update to Java 17 - update toolchain to Java 21 - bump nextflow to 24.11.0-edge Signed-off-by: Tom Sellman --- .github/workflows/build.yml | 2 +- .../groovy/io.nextflow.groovy-common-conventions.gradle | 8 ++++---- plugins/nf-hello/build.gradle | 2 +- plugins/nf-hello/src/resources/META-INF/MANIFEST.MF | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ae1801..277c376 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - java_version: [11, 21] + java_version: [17, 21] steps: - name: Environment diff --git a/buildSrc/src/main/groovy/io.nextflow.groovy-common-conventions.gradle b/buildSrc/src/main/groovy/io.nextflow.groovy-common-conventions.gradle index 9854a8d..d51949f 100644 --- a/buildSrc/src/main/groovy/io.nextflow.groovy-common-conventions.gradle +++ b/buildSrc/src/main/groovy/io.nextflow.groovy-common-conventions.gradle @@ -14,17 +14,17 @@ repositories { java { toolchain { - languageVersion = JavaLanguageVersion.of(19) + languageVersion = JavaLanguageVersion.of(21) } } compileJava { - options.release.set(11) + options.release.set(17) } tasks.withType(GroovyCompile) { - sourceCompatibility = '11' - targetCompatibility = '11' + sourceCompatibility = '17' + targetCompatibility = '17' } tasks.withType(Test) { diff --git a/plugins/nf-hello/build.gradle b/plugins/nf-hello/build.gradle index c051b00..e7c1f22 100644 --- a/plugins/nf-hello/build.gradle +++ b/plugins/nf-hello/build.gradle @@ -50,7 +50,7 @@ sourceSets { } ext{ - nextflowVersion = '24.01.0-edge' + nextflowVersion = '24.11.0-edge' } dependencies { diff --git a/plugins/nf-hello/src/resources/META-INF/MANIFEST.MF b/plugins/nf-hello/src/resources/META-INF/MANIFEST.MF index b00204b..d01e0c8 100644 --- a/plugins/nf-hello/src/resources/META-INF/MANIFEST.MF +++ b/plugins/nf-hello/src/resources/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Plugin-Id: nf-hello -Plugin-Version: 0.5.0 +Plugin-Version: 0.6.0 Plugin-Class: nextflow.hello.HelloPlugin Plugin-Provider: nextflow -Plugin-Requires: >=24.01.0-edge +Plugin-Requires: >=24.11.0-edge