From acb45a1dea61dd844fba839cc31c79a7aca4bbe4 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Fri, 4 Nov 2022 16:53:22 +0100 Subject: build: Increase minimum Java version to Java 17 This change updates the Gradle configuration to target Java 17 (instead of Java 11) as the lowest denominator when running/building OpenDC. This version of Java has been available for more than a year and is the latest LTS release. --- .github/workflows/build.yml | 4 ++-- .github/workflows/release.yml | 1 - .github/workflows/test-gradle-rc.yml | 3 ++- .github/workflows/test-java-ea.yml | 3 ++- buildSrc/src/main/kotlin/Libs.kt | 2 +- site/docs/advanced-guides/toolchain.md | 2 +- site/docs/getting-started/0-installation.md | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0747ad33..79bbe4d9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,10 +13,10 @@ jobs: strategy: matrix: os: [ ubuntu-latest ] - java: [ 11, 17, 18 ] + java: [ 17, 19 ] include: - os: windows-latest - java: 18 + java: 19 steps: - name: Checkout repository uses: actions/checkout@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2d893edf..73ec0a4d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,6 @@ jobs: with: arguments: publish env: - ORG_GRADLE_PROJECT_signingKeyId: F8134F9C ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_PRIVATE_KEY }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }} ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.OSSRH_USERNAME }} diff --git a/.github/workflows/test-gradle-rc.yml b/.github/workflows/test-gradle-rc.yml index a39d36d7..b58bbcb1 100644 --- a/.github/workflows/test-gradle-rc.yml +++ b/.github/workflows/test-gradle-rc.yml @@ -11,8 +11,9 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 18 + java-version: 19 - uses: gradle/gradle-build-action@v2 with: + cache-disabled: true gradle-version: release-candidate arguments: build --dry-run # just test build configuration diff --git a/.github/workflows/test-java-ea.yml b/.github/workflows/test-java-ea.yml index f3c31928..d0324b1b 100644 --- a/.github/workflows/test-java-ea.yml +++ b/.github/workflows/test-java-ea.yml @@ -11,8 +11,9 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 19-ea + java-version: 20-ea - uses: gradle/gradle-build-action@v2 with: + cache-disabled: true gradle-version: release-candidate arguments: build diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt index 6a73e1b9..97dc36ca 100644 --- a/buildSrc/src/main/kotlin/Libs.kt +++ b/buildSrc/src/main/kotlin/Libs.kt @@ -50,6 +50,6 @@ public class Libs(project: Project) { /** * The JVM version to target. */ - val jvmTarget = JavaVersion.VERSION_11 + val jvmTarget = JavaVersion.VERSION_17 } } diff --git a/site/docs/advanced-guides/toolchain.md b/site/docs/advanced-guides/toolchain.md index 36efece7..a1735767 100644 --- a/site/docs/advanced-guides/toolchain.md +++ b/site/docs/advanced-guides/toolchain.md @@ -22,7 +22,7 @@ Follow the steps below to get it all set up! ## 1. Installing Java -OpenDC requires a Java installation of version 11 or higher. Make sure to install +OpenDC requires a Java installation of version 17 or higher. Make sure to install the [JDK](https://www.oracle.com/technetwork/java/javase/downloads/index.html), not only the JRE (the JDK also includes a JRE). diff --git a/site/docs/getting-started/0-installation.md b/site/docs/getting-started/0-installation.md index 2747c344..9b9b0e82 100644 --- a/site/docs/getting-started/0-installation.md +++ b/site/docs/getting-started/0-installation.md @@ -14,7 +14,7 @@ quicker. 1. **Supported Platforms** OpenDC is actively tested on Windows, macOS and GNU/Linux. 2. **Required Software** - A Java installation of version 11 or higher is required for OpenDC. You may download the + A Java installation of version 17 or higher is required for OpenDC. You may download the [Java distribution from Oracle](https://www.oracle.com/java/technologies/downloads/) or use the distribution provided by your package manager. -- cgit v1.2.3