From 6460ba293baf955c447725054ee33159b6876cbe Mon Sep 17 00:00:00 2001 From: sciencewhiz Date: Mon, 6 May 2024 19:29:24 -0700 Subject: [PATCH] Update for JDK 17 Build with JDK 17 in CI Update Readme Link to Java 17 API --- .github/workflows/main.yml | 8 ++++---- README.md | 6 +++--- build.gradle | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3c402ae13..1a2353a76 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,8 +42,8 @@ jobs: - uses: actions/setup-java@v3 with: - java-version: 11 - distribution: 'zulu' + java-version: 17 + distribution: 'temurin' architecture: ${{ matrix.architecture }} - name: Install dependencies @@ -91,8 +91,8 @@ jobs: - uses: actions/setup-java@v3 with: - java-version: 11 - distribution: 'zulu' + java-version: 17 + distribution: 'temurin' - uses: actions/download-artifact@v3 with: diff --git a/README.md b/README.md index f8d6b3e3d..a5fba901a 100644 --- a/README.md +++ b/README.md @@ -16,8 +16,8 @@ It can also be run manually by running the shuffleboard.vbs in `c:\Users\public\ shuffleboard.py in `~/wpilib//tools` (Linux or Mac). ### Requirements -- [JRE 11](https://adoptopenjdk.net/). Java 11 is required. -No other version of Java is supported. Java 11 is installed by the +- [JRE 17](https://adoptium.net/temurin/releases/?version=17&package=jre). Java 17 is required. +No other version of Java is supported. Java 17 is installed by the [WPILib installer](https://github.com/wpilibsuite/allwpilib/releases). ## Building @@ -41,5 +41,5 @@ Only the listed platforms are supported To build _all_ platform-specific JARs at once, use the command `./gradlew :app:shadowJarAllPlatforms` ### Requirements -- [JDK 11](https://adoptopenjdk.net/). JDK 11 is required. +- [JDK 17](https://adoptium.net/temurin/releases/?version=17). JDK 17 is required. No other version of Java is supported. diff --git a/build.gradle b/build.gradle index 9792c1ab1..408419f6d 100644 --- a/build.gradle +++ b/build.gradle @@ -190,7 +190,7 @@ allprojects { tasks.withType(Javadoc) { options.encoding = "UTF-8" - options.links 'https://docs.oracle.com/en/java/javase/11/docs/api/' + options.links 'https://docs.oracle.com/en/java/javase/17/docs/api/' options.tags( 'implSpec:a:Implementation Requirements:', 'implNote:a:Implementation Note:'