Skip to content

Commit

Permalink
bump the java version
Browse files Browse the repository at this point in the history
  • Loading branch information
frett committed Dec 2, 2024
1 parent 572a8eb commit ed83d86
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .java-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
temurin-17.0.7+7
temurin-21.0.4+7.0.LTS
2 changes: 1 addition & 1 deletion build-logic/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(17))
languageVersion.set(JavaLanguageVersion.of(21))
}

dependencies {
Expand Down
6 changes: 3 additions & 3 deletions build-logic/src/main/kotlin/AndroidConfiguration.kt
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,14 @@ private fun BaseExtension.configureSdk() {

private fun BaseExtension.configureCompilerOptions(project: Project) {
project.extensions.findByType<KotlinAndroidProjectExtension>()?.apply {
jvmToolchain(17)
jvmToolchain(21)
}

compileOptions {
// HACK: workaround a kotlin.jvmToolchain bug
// see: https://issuetracker.google.com/issues/260059413
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}
(this as ExtensionAware).extensions.findByType<KotlinJvmOptions>()?.apply {
freeCompilerArgs += "-Xjvm-default=all"
Expand Down

0 comments on commit ed83d86

Please sign in to comment.