Skip to content

Commit

Permalink
Update for JDK 17 (#801)
Browse files Browse the repository at this point in the history
Build with JDK 17 in CI
Update Readme
Link to Java 17 API
  • Loading branch information
sciencewhiz authored May 7, 2024
1 parent 78c1c02 commit 16715a8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ It can also be run manually by running the shuffleboard.vbs in `c:\Users\public\
shuffleboard.py in `~/wpilib/<year>/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
Expand All @@ -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.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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:'
Expand Down

0 comments on commit 16715a8

Please sign in to comment.