Migrate to Java 21

ghokun · Sep 19, 2023 · 0c4a209 · 0c4a209
1 parent 04fd0ad
commit 0c4a209
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -7,7 +7,7 @@ on:
   pull_request:
 
 env:
-  JAVA_VERSION: '20'
+  JAVA_VERSION: '21'
 
 jobs:
   build:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -8,7 +8,7 @@ on:
         required: true
 
 env:
-  JAVA_VERSION: '20'
+  JAVA_VERSION: '21'
 
 jobs:
   build:

diff --git a/build.gradle b/build.gradle
@@ -83,8 +83,8 @@ dependencies {
 
 application {
   mainClass = "dev.gokhun.convert.Convert"
-  sourceCompatibility = JavaVersion.VERSION_20
-  targetCompatibility = JavaVersion.VERSION_20
+  sourceCompatibility = JavaVersion.VERSION_21
+  targetCompatibility = JavaVersion.VERSION_21
 }
 
 tasks.register("generateVersionProvider") {

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -83,8 +83,7 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ on: @@
       pull_request:
     env:
-      JAVA_VERSION: '20'
+      JAVA_VERSION: '21'
     jobs:
       build:
@@ Expand Down @@