Bump Java edge dependency version to 21 (#2296)

temporalio · Oct 26, 2024 · 2ded985 · 2ded985
1 parent 6efbde3
commit 2ded985
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Set up Java
       uses: actions/setup-java@v4
       with:
-        java-version: "19"
+        java-version: "21"
         distribution: "temurin"
 
     - name: Set up Gradle

diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ plugins {
     //    id 'org.jetbrains.kotlin.jvm' version '1.6.21'
     //    id 'org.jetbrains.kotlin.jvm' version '1.7.22'
     //    id 'org.jetbrains.kotlin.jvm' version '1.8.20'
-    id 'org.jetbrains.kotlin.jvm' version '1.8.20' apply false
+    id 'org.jetbrains.kotlin.jvm' version '1.9.24' apply false
     id 'base'
 }
 

diff --git a/gradle/java.gradle b/gradle/java.gradle
@@ -5,9 +5,9 @@ subprojects {
     apply plugin: 'java-library'
 
     java {
-        // graal only supports java 8, 11, 16, 17
-        sourceCompatibility = project.hasProperty("edgeDepsTest") ? JavaVersion.VERSION_17 : JavaVersion.VERSION_1_8
-        targetCompatibility = project.hasProperty("edgeDepsTest") ? JavaVersion.VERSION_17 : JavaVersion.VERSION_1_8
+        // graal only supports java 8, 11, 16, 17, 21, 23
+        sourceCompatibility = project.hasProperty("edgeDepsTest") ? JavaVersion.VERSION_21 : JavaVersion.VERSION_1_8
+        targetCompatibility = project.hasProperty("edgeDepsTest") ? JavaVersion.VERSION_21 : JavaVersion.VERSION_1_8
         withJavadocJar()
         withSourcesJar()
     }

diff --git a/temporal-kotlin/build.gradle b/temporal-kotlin/build.gradle
@@ -11,7 +11,7 @@ description = '''Temporal Workflow Java SDK Kotlin'''
 tasks.withType(KotlinCompile).all {
     kotlinOptions {
         freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
-        jvmTarget = project.hasProperty("edgeDepsTest") ? JavaVersion.VERSION_17 : JavaVersion.VERSION_1_8
+        jvmTarget = project.hasProperty("edgeDepsTest") ? JavaVersion.VERSION_21 : JavaVersion.VERSION_1_8
         languageVersion = "${project.hasProperty("edgeDepsTest") ? '1.8' : (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16) ? '1.5' : '1.4')}"
     }
 }