Skip to content

Commit 16228c5

Browse files
committed
build!: Upgrade to Java 25 to benefit from various optimizations
BREAKING CHANGE: ORT is now compiled to bytecode level 69, so programmatic users of ORT libraries have to use Java 25 as well. Also, the `Gradle`, `GradleInspector`, and `SBT` package managers will now use Java 25 by default unless overridden via their `javaVersion` plugin options. Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.io>
1 parent 2adf5e4 commit 16228c5

13 files changed

Lines changed: 150 additions & 122 deletions

File tree

.env.versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ DOTNET_VERSION=6.0
1313
GLEAM_VERSION=1.13.0
1414
GO_VERSION=1.25.0
1515
HASKELL_STACK_VERSION=2.13.1
16-
JAVA_VERSION=21
16+
JAVA_VERSION=25
1717
LICENSEE_VERSION=9.18.0
1818
MIX_SBOM_VERSION=0.9.1
1919
NODEJS_VERSION=24.15.0

.github/workflows/build-and-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
2727
with:
2828
distribution: temurin
29-
java-version: 21
29+
java-version: 25
3030
- name: Setup Gradle
3131
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
3232
- name: Build all classes
@@ -65,7 +65,7 @@ jobs:
6565
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
6666
with:
6767
distribution: temurin
68-
java-version: 21
68+
java-version: 25
6969
- name: Setup Gradle
7070
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
7171
- name: Install Flox

.github/workflows/static-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
4242
with:
4343
distribution: temurin
44-
java-version: 21
44+
java-version: 25
4545
- name: Setup Gradle
4646
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
4747
- name: Generate completions

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ If you have further questions, reach out to the ORT community on [Slack][2] or c
6565

6666
ORT is being continuously used on Linux, Windows and macOS by the [core development team](https://github.com/orgs/oss-review-toolkit/people), so these operating systems are considered to be well-supported.
6767

68-
To run the ORT binaries (also see [Installation from binaries](#from-binaries)) at least Java 21 is required.
68+
To run the ORT binaries (also see [Installation from binaries](#from-binaries)) at least Java 25 is required.
6969
Memory and CPU requirements vary depending on the size and type of project(s) to analyze / scan, but the general recommendation is to configure Java with 8 GiB of memory and to use a CPU with at least 4 cores.
7070

7171
```shell
@@ -125,7 +125,7 @@ Alternatively, use the script at `scripts/docker_build.sh` which also sets the O
125125

126126
Install these additional prerequisites:
127127

128-
* Java Development Kit (JDK) version 21 or later; also remember to set the `JAVA_HOME` environment variable accordingly.
128+
* Java Development Kit (JDK) version 25 or later; also remember to set the `JAVA_HOME` environment variable accordingly.
129129

130130
Change into the directory with ORT's source code and run `./gradlew :cli:installDist` (on the first run this will bootstrap Gradle and download all required dependencies).
131131

flox/external-tools/.flox/env/manifest.lock

Lines changed: 61 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flox/external-tools/.flox/env/manifest.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Flox manifest version managed by Flox CLI
2-
version = 1
2+
schema-version = "1.10.0"
33

44
[vars]
55
FLOX_DISABLE_METRICS = "true"

0 commit comments

Comments
 (0)