Skip to content

Commit

Permalink
chore: update kalium with java 17 and jenv to 17.0 (#1979)
Browse files Browse the repository at this point in the history
Co-authored-by: Tommaso Piazza <[email protected]>
  • Loading branch information
Garzas and tmspzz authored Jul 24, 2023
1 parent 0cf6486 commit 82ec5af
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .java-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
11
17.0
9 changes: 4 additions & 5 deletions build-logic/plugins/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,14 @@ plugins {
`kotlin-dsl`
}

// Configure the build-logic plugins to target JDK 11
// TODO: Upgrade Jenkins image to support JDK 17 and bump it here too
// Configure the build-logic plugins to target JDK 17
java {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
jvmTarget = JavaVersion.VERSION_17.toString()
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ internal fun Project.configureKotlinAndroid(
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
isCoreLibraryDesugaringEnabled = true
}

Expand Down Expand Up @@ -69,8 +69,8 @@ internal fun Project.configureKotlinAndroid(
private fun Project.configureKotlin() {
tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
// Set JVM target to 11
jvmTarget = JavaVersion.VERSION_11.toString()
// Set JVM target to 17
jvmTarget = JavaVersion.VERSION_17.toString()
// Treat all Kotlin warnings as errors (disabled by default)
// Override by setting warningsAsErrors=true in your ~/.gradle/gradle.properties
val warningsAsErrors: String? by project
Expand Down

0 comments on commit 82ec5af

Please sign in to comment.