From 7b38a719477000a1e3eb9a70f5e5ba679070a2c8 Mon Sep 17 00:00:00 2001 From: Mason-Lam <97353903+Mason-Lam@users.noreply.github.com> Date: Fri, 12 Jan 2024 13:23:23 -0800 Subject: [PATCH] Migrate to JDK 17 --- .classpath | 2 +- .github/workflows/gradleCI.yml | 8 ++++---- .github/workflows/gradleRelease.yml | 8 ++++---- build.gradle | 28 ++++++++++++++-------------- jitpack.yml | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.classpath b/.classpath index c1cbc00..e7e7bd6 100644 --- a/.classpath +++ b/.classpath @@ -12,7 +12,7 @@ - + diff --git a/.github/workflows/gradleCI.yml b/.github/workflows/gradleCI.yml index 692ef6b..89797da 100644 --- a/.github/workflows/gradleCI.yml +++ b/.github/workflows/gradleCI.yml @@ -12,11 +12,11 @@ jobs: - name: Checkout Repository uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: distribution: 'adopt' - java-version: 11 + java-version: 17 cache: 'gradle' - name: Build @@ -37,11 +37,11 @@ jobs: # - name: Checkout Repository # uses: actions/checkout@v3 - # - name: Set up JDK 11 + # - name: Set up JDK 17 # uses: actions/setup-java@v3 # with: # distribution: 'adopt' - # java-version: 11 + # java-version: 17 # cache: gradle # - name: Generate 3128-common.json diff --git a/.github/workflows/gradleRelease.yml b/.github/workflows/gradleRelease.yml index 70b51cf..a05d21d 100644 --- a/.github/workflows/gradleRelease.yml +++ b/.github/workflows/gradleRelease.yml @@ -21,11 +21,11 @@ jobs: with: tagRegex: "v(.*)" # This filters out the `v` from the tag. (Ex: v3.8.0 becomes 3.8.0) - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: distribution: 'adopt' - java-version: 11 + java-version: 17 cache: gradle - name: Build 3128-common @@ -69,11 +69,11 @@ jobs: - name: Checkout Repository uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: distribution: 'adopt' - java-version: 11 + java-version: 17 cache: gradle # - name: Generate 3128-common.json diff --git a/build.gradle b/build.gradle index d580262..5503c22 100644 --- a/build.gradle +++ b/build.gradle @@ -9,12 +9,12 @@ plugins { group = archivesGroup -// Sets JDK compatibility to JDK 11 -sourceCompatibility = JavaVersion.VERSION_11 -targetCompatibility = JavaVersion.VERSION_11 +// Sets JDK compatibility to JDK 17 +sourceCompatibility = JavaVersion.VERSION_17 +targetCompatibility = JavaVersion.VERSION_17 // Configuration for build task which compiles , generates the javadoc and does the install -// of RobotLib in local maven cache. +// of 3128-common in local maven cache. // Also used by Jitpack/GitHub Actions. if (System.getProperty("local")) { @@ -27,17 +27,17 @@ else { } // Version identifier used for local maven cache and github releases. // Should stay as "local". This allows the robot* projects on the - // same PC as RobotLib to pull from the local cache with the fixed - // version name "local" and so always be pointing at the current RobotLib + // same PC as 3128-common to pull from the local cache with the fixed + // version name "local" and so always be pointing at the current 3128-common // version including those under development and not have to be updated - // each time the robotlib version changes. Release to the world via github - // is based on actual version numbers and robotLib.json. + // each time the 3128-common version changes. Release to the world via github + // is based on actual version numbers and 3128-common.json. // // When starting a new version you can update LibraryVersion.java, - // overview.html and gradle.properties. DO NOT update robotlib.json. It is + // overview.html and gradle.properties. DO NOT update 3128-common.json. It is // maintained by the release github action when you release with github. // - // Build in Eclispe using the Build RobotLib or Build RobotLib (Offline) + // Build in Eclispe using the Build 3128-common or Build 3128-common (Offline) // run configurations. You can push to github as much as you want. // // When ready to release, make sure the version number and dates are @@ -53,15 +53,15 @@ else { // and sets the version varible to the actual version number (instead // of "local") when compiling for release. The release action will update // robolib.json to the new version on github. After release action is complete - // you can fetch from github with tags to get the updated robotlib.json and + // you can fetch from github with tags to get the updated 3128-common.json and // release tag back into the local git repo. // // When all this is done, other user's robot projects that want the updated - // RobotLib, edit their local RobotLib.json to reflect the new version number + // 3128-common, edit their local 3128-common.json to reflect the new version number // and on next compile, gradle will pull the new library to their PC. // // Or if using VSCode, run the Manage Vendor Libraries (online) command and - // it will detect the new RobotLib version and offer to update the VSCode project. + // it will detect the new 3128-common version and offer to update the VSCode project. // // Warning: The github release action only works on the master branch. Do not // create releases from other branches. @@ -136,7 +136,7 @@ dependencies { // Quick guide to keywords: // api is for libraries that are expected to be needed in the main robot project. // implementation is for libraries that will not be needed in the main robot project. - // (Both api and implementation keywords will have the library automatically downloaded with RobotLib) + // (Both api and implementation keywords will have the library automatically downloaded with 3128-common) // compileOnly expects the dependency to be provided somewhere else. (Ex. by a main robot project) // compile means include in the output library jar (see below). } diff --git a/jitpack.yml b/jitpack.yml index 46c8529..1e41e00 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,2 +1,2 @@ jdk: - - openjdk11 \ No newline at end of file + - openjdk17 \ No newline at end of file