Merge pull request #29 from ELIXIR-NO/upgrade-java-gradle-version

Upgrade from Java 17 to Java 21
ELIXIR-NO · Jan 9, 2024 · b7d3015 · b7d3015
2 parents 04e2f6b + 28d2a07
commit b7d3015
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -25,7 +25,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
 
       - name: Cache gradle packages
         uses: actions/cache@v3

diff --git a/.github/workflows/check-formatting.yml b/.github/workflows/check-formatting.yml
@@ -25,7 +25,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
 
       - uses: actions/cache@v3
         with:

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -79,7 +79,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: '17'
+        java-version: '21'
 
     - name: Cache gradle packages
       uses: actions/cache@v3

diff --git a/buildSrc/src/main/kotlin/springboot-conventions.gradle.kts b/buildSrc/src/main/kotlin/springboot-conventions.gradle.kts
@@ -7,7 +7,7 @@ plugins {
     id("formatting-conventions")
 }
 
-java { sourceCompatibility = JavaVersion.VERSION_17 }
+java { sourceCompatibility = JavaVersion.VERSION_21 }
 
 configurations {
     compileOnly {

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.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/lib/clearinghouse/build.gradle.kts b/lib/clearinghouse/build.gradle.kts
@@ -13,8 +13,8 @@ repositories {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 dependencies {