Skip to content

Commit 51514de

Browse files
pditommasoclaude
andcommitted
Add support for Java 26
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Paolo Di Tommaso <paolo.ditommaso@gmail.com>
1 parent fc4d7dd commit 51514de

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
java_version: [17, 24]
28+
java_version: [17, 25]
2929

3030
steps:
3131
- name: Checkout
@@ -116,7 +116,7 @@ jobs:
116116
strategy:
117117
fail-fast: false
118118
matrix:
119-
java_version: [17, 24]
119+
java_version: [17, 25]
120120
test_mode: ["test_integration", "test_parser_v2", "test_docs", "test_aws", "test_azure", "test_google", "test_wave"]
121121
steps:
122122
- name: Checkout

docs/install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ New versions of Nextflow are released regularly. See {ref}`updating-nextflow-pag
1212

1313
## Requirements
1414

15-
Nextflow requires Bash 3.2 (or later) and [Java 17 (or later, up to 25)](http://www.oracle.com/technetwork/java/javase/downloads/index.html) to be installed. To see which version of Java you have, run the following command:
15+
Nextflow requires Bash 3.2 (or later) and [Java 17 (or later, up to 26)](http://www.oracle.com/technetwork/java/javase/downloads/index.html) to be installed. To see which version of Java you have, run the following command:
1616

1717
```{code-block} bash
1818
:class: copyable

launch.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,14 @@ fi
6767
JAVA_VER=$(echo "$JAVA_VER" | awk '/version/ {gsub(/"/, "", $3); print $3}')
6868
major=${BASH_REMATCH[1]}
6969
minor=${BASH_REMATCH[2]}
70-
version_check="^(17|18|19|20|21|23|24|25)"
70+
version_check="^(17|18|19|20|21|22|23|24|25|26)"
7171
if [[ ! $JAVA_VER =~ $version_check ]]; then
7272
echo "Error: cannot find Java or it's a wrong version -- please make sure that Java 17 or higher is installed"
7373
exit 1
7474
fi
7575
JVM_ARGS+=" -Dfile.encoding=UTF-8 -XX:+TieredCompilation -XX:TieredStopAtLevel=1"
7676
JVM_ARGS+=" --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio.file.spi=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/sun.nio.fs=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.http=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.https=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.ftp=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.file=ALL-UNNAMED --add-opens=java.base/jdk.internal.misc=ALL-UNNAMED --add-opens=java.base/jdk.internal.vm=ALL-UNNAMED --add-opens=java.base/java.util.regex=ALL-UNNAMED"
77-
[[ "$JAVA_VER" =~ ^(24|25) ]]&& JVM_ARGS+=" --enable-native-access=ALL-UNNAMED --sun-misc-unsafe-memory-access=allow"
77+
[[ "$JAVA_VER" =~ ^(24|25|26) ]]&& JVM_ARGS+=" --enable-native-access=ALL-UNNAMED --sun-misc-unsafe-memory-access=allow"
7878
[[ $NXF_ENABLE_VIRTUAL_THREADS == 'true' ]] && [[ "$JAVA_VER" =~ ^(19|20) ]] && JVM_ARGS+=" --enable-preview"
7979
[[ "$JAVA_VER" =~ ^(21) ]] && [[ ! "$NXF_ENABLE_VIRTUAL_THREADS" ]] && NXF_ENABLE_VIRTUAL_THREADS=true
8080

nextflow

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,8 @@ else
345345
fi
346346
major=${BASH_REMATCH[1]}
347347
minor=${BASH_REMATCH[2]}
348-
version_check="^(17|18|19|20|21|22|23|24|25)"
349-
version_message="Java 17 or later (up to 25)"
348+
version_check="^(17|18|19|20|21|22|23|24|25|26)"
349+
version_message="Java 17 or later (up to 26)"
350350
if [[ ! $JAVA_VER =~ $version_check ]]; then
351351
echo_red "ERROR: Cannot find Java or it's a wrong version -- please make sure that $version_message is installed"
352352
if [[ "$NXF_JAVA_HOME" ]]; then
@@ -470,13 +470,13 @@ else
470470
launcher+=(--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED)
471471
launcher+=(--add-opens=java.base/jdk.internal.vm=ALL-UNNAMED)
472472
launcher+=(--add-opens=java.base/java.util.regex=ALL-UNNAMED)
473-
if [[ "$JAVA_VER" =~ ^(24|25) ]]; then
473+
if [[ "$JAVA_VER" =~ ^(24|25|26) ]]; then
474474
launcher+=(--enable-native-access=ALL-UNNAMED)
475475
launcher+=(--sun-misc-unsafe-memory-access=allow)
476476
fi
477477
if [[ "$NXF_ENABLE_VIRTUAL_THREADS" == 'true' ]]; then
478478
if [[ "$JAVA_VER" =~ ^(19|20) ]]; then launcher+=(--enable-preview)
479-
elif [[ ! "$JAVA_VER" =~ ^(21|22|23|24|25) ]]; then die "Virtual threads require Java 19 or later - current version $JAVA_VER"
479+
elif [[ ! "$JAVA_VER" =~ ^(21|22|23|24|25|26) ]]; then die "Virtual threads require Java 19 or later - current version $JAVA_VER"
480480
fi
481481
fi
482482
launcher+=("${cmd_tail[@]}")

0 commit comments

Comments
 (0)