Skip to content

Commit 2ded985

Browse files
Bump Java edge dependency version to 21 (#2296)
1 parent 6efbde3 commit 2ded985

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Set up Java
2222
uses: actions/setup-java@v4
2323
with:
24-
java-version: "19"
24+
java-version: "21"
2525
distribution: "temurin"
2626

2727
- name: Set up Gradle

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ plugins {
1717
// id 'org.jetbrains.kotlin.jvm' version '1.6.21'
1818
// id 'org.jetbrains.kotlin.jvm' version '1.7.22'
1919
// id 'org.jetbrains.kotlin.jvm' version '1.8.20'
20-
id 'org.jetbrains.kotlin.jvm' version '1.8.20' apply false
20+
id 'org.jetbrains.kotlin.jvm' version '1.9.24' apply false
2121
id 'base'
2222
}
2323

gradle/java.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ subprojects {
55
apply plugin: 'java-library'
66

77
java {
8-
// graal only supports java 8, 11, 16, 17
9-
sourceCompatibility = project.hasProperty("edgeDepsTest") ? JavaVersion.VERSION_17 : JavaVersion.VERSION_1_8
10-
targetCompatibility = project.hasProperty("edgeDepsTest") ? JavaVersion.VERSION_17 : JavaVersion.VERSION_1_8
8+
// graal only supports java 8, 11, 16, 17, 21, 23
9+
sourceCompatibility = project.hasProperty("edgeDepsTest") ? JavaVersion.VERSION_21 : JavaVersion.VERSION_1_8
10+
targetCompatibility = project.hasProperty("edgeDepsTest") ? JavaVersion.VERSION_21 : JavaVersion.VERSION_1_8
1111
withJavadocJar()
1212
withSourcesJar()
1313
}

temporal-kotlin/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ description = '''Temporal Workflow Java SDK Kotlin'''
1111
tasks.withType(KotlinCompile).all {
1212
kotlinOptions {
1313
freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
14-
jvmTarget = project.hasProperty("edgeDepsTest") ? JavaVersion.VERSION_17 : JavaVersion.VERSION_1_8
14+
jvmTarget = project.hasProperty("edgeDepsTest") ? JavaVersion.VERSION_21 : JavaVersion.VERSION_1_8
1515
languageVersion = "${project.hasProperty("edgeDepsTest") ? '1.8' : (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16) ? '1.5' : '1.4')}"
1616
}
1717
}

0 commit comments

Comments
 (0)