Skip to content

Commit 3bd6774

Browse files
committed
chore: bump target jdk for Workflows & CI to JDK 21
1 parent 47bc9f3 commit 3bd6774

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

.github/workflows/android-spotless.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v4
15-
- name: set up JDK 17
15+
- name: Set up JDK 21
1616
uses: actions/setup-java@v4
1717
with:
18-
java-version: 17
18+
java-version: 21
1919
distribution: 'adopt'
2020
- name: Setup Gradle
2121
uses: gradle/gradle-build-action@v3

.github/workflows/android-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v4
15-
- name: set up JDK 17
15+
- name: Set up JDK 21
1616
uses: actions/setup-java@v4
1717
with:
18-
java-version: 17
18+
java-version: 21
1919
distribution: 'adopt'
2020
- name: Setup Gradle
2121
uses: gradle/gradle-build-action@v3

.github/workflows/gradle-dokka.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v4
12-
- name: set up JDK 17
12+
- name: Set up JDK 21
1313
uses: actions/setup-java@v4
1414
with:
15-
java-version: 17
15+
java-version: 21
1616
distribution: 'adopt'
1717
- name: Setup Gradle
1818
uses: gradle/gradle-build-action@v3

buildSrc/src/main/java/co/anitrend/arch/buildSrc/plugin/components/AndroidConfiguration.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ internal fun Project.configureAndroid(): Unit = baseExtension().run {
7171
configureLint()
7272

7373
compileOptions {
74-
sourceCompatibility = JavaVersion.VERSION_17
75-
targetCompatibility = JavaVersion.VERSION_17
74+
sourceCompatibility = JavaVersion.VERSION_21
75+
targetCompatibility = JavaVersion.VERSION_21
7676
}
7777

7878
tasks.withType(KotlinCompilationTask::class.java) {
@@ -98,6 +98,6 @@ internal fun Project.configureAndroid(): Unit = baseExtension().run {
9898
}
9999

100100
kotlinAndroidProjectExtension().run {
101-
jvmToolchain(17)
101+
jvmToolchain(21)
102102
}
103103
}

buildSrc/src/main/java/co/anitrend/arch/buildSrc/plugin/components/ProjectDokka.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ internal fun Project.configureDokka() = tasks.named<DokkaTask>("dokkaHtml") {
126126
}
127127

128128
// Used for linking to JDK documentation
129-
jdkVersion.set(17)
129+
jdkVersion.set(21)
130130

131131
// Disable linking to online kotlin-stdlib documentation
132132
noStdlibLink.set(false)

jitpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
jdk:
2-
- openjdk17
2+
- openjdk21
33
#before_install:
44
# - ./custom_setup.sh
55
install:

0 commit comments

Comments
 (0)