Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: upgrade JDK to 21 #166

Merged
merged 1 commit into from
Sep 26, 2024
Merged

chore: upgrade JDK to 21 #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/deploy-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
java-version: 21

- name: Deploy release
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/verify-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
java-version: 21

- name: Check app
run: ./gradlew check
Expand All @@ -37,7 +37,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
java-version: 21

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
Expand Down
6 changes: 6 additions & 0 deletions android-tests/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ val androidMinSdk: Int by rootProject.extra
val androidTargetSdk: Int by rootProject.extra
val androidCompileSdk: Int by rootProject.extra

java {
toolchain {
languageVersion = JavaLanguageVersion.of(21)
}
}

android {
namespace = "com.svenjacobs.reveal.android.tests"
compileSdk = androidCompileSdk
Expand Down
6 changes: 6 additions & 0 deletions convention-plugins/src/main/kotlin/convention.multiplatform.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ plugins {

val baseName: String by extra

java {
toolchain {
languageVersion = JavaLanguageVersion.of(21)
}
}

kotlin {
applyDefaultHierarchyTemplate()

Expand Down
6 changes: 6 additions & 0 deletions reveal-compat-android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ plugins {
id("convention.publication")
}

java {
toolchain {
languageVersion = JavaLanguageVersion.of(21)
}
}

val publicationName by extra { "Reveal (Compat Android)" }

val androidMinSdk: Int by rootProject.extra
Expand Down