Skip to content

Commit c8b7766

Browse files
authored
Merge pull request #689 from android/source_target_compat_to_11
Set the source/target compatibility to 11
2 parents e1ae121 + e1bb03b commit c8b7766

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

build-logic/convention/build.gradle.kts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,15 @@ plugins {
2323
group = "com.google.samples.apps.nowinandroid.buildlogic"
2424

2525
java {
26-
sourceCompatibility = JavaVersion.VERSION_17
27-
targetCompatibility = JavaVersion.VERSION_17
26+
// Up to Java 11 APIs are available through desugaring
27+
// https://developer.android.com/studio/write/java11-minimal-support-table
28+
sourceCompatibility = JavaVersion.VERSION_11
29+
targetCompatibility = JavaVersion.VERSION_11
2830
}
2931

3032
tasks.withType<KotlinCompile>().configureEach {
3133
kotlinOptions {
32-
jvmTarget = JavaVersion.VERSION_17.toString()
34+
jvmTarget = JavaVersion.VERSION_11.toString()
3335
}
3436
}
3537

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,10 @@
1717
package com.google.samples.apps.nowinandroid
1818

1919
import com.android.build.api.dsl.CommonExtension
20-
import org.gradle.api.JavaVersion
2120
import org.gradle.api.Project
2221
import org.gradle.api.artifacts.VersionCatalogsExtension
2322
import org.gradle.kotlin.dsl.dependencies
2423
import org.gradle.kotlin.dsl.getByType
25-
import org.gradle.kotlin.dsl.provideDelegate
2624
import org.gradle.kotlin.dsl.withType
2725
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2826
import java.io.File

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,10 @@ internal fun Project.configureKotlinAndroid(
4040
}
4141

4242
compileOptions {
43-
sourceCompatibility = JavaVersion.VERSION_17
44-
targetCompatibility = JavaVersion.VERSION_17
43+
// Up to Java 11 APIs are available through desugaring
44+
// https://developer.android.com/studio/write/java11-minimal-support-table
45+
sourceCompatibility = JavaVersion.VERSION_11
46+
targetCompatibility = JavaVersion.VERSION_11
4547
isCoreLibraryDesugaringEnabled = true
4648
}
4749
}
@@ -50,7 +52,7 @@ internal fun Project.configureKotlinAndroid(
5052
tasks.withType<KotlinCompile>().configureEach {
5153
kotlinOptions {
5254
// Set JVM target to 17
53-
jvmTarget = JavaVersion.VERSION_17.toString()
55+
jvmTarget = JavaVersion.VERSION_11.toString()
5456
// Treat all Kotlin warnings as errors (disabled by default)
5557
// Override by setting warningsAsErrors=true in your ~/.gradle/gradle.properties
5658
val warningsAsErrors: String? by project

lint/build.gradle.kts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,15 @@ plugins {
2323
}
2424

2525
java {
26-
sourceCompatibility = JavaVersion.VERSION_17
27-
targetCompatibility = JavaVersion.VERSION_17
26+
// Up to Java 11 APIs are available through desugaring
27+
// https://developer.android.com/studio/write/java11-minimal-support-table
28+
sourceCompatibility = JavaVersion.VERSION_11
29+
targetCompatibility = JavaVersion.VERSION_11
2830
}
2931

3032
tasks.withType<KotlinCompile>().configureEach {
3133
kotlinOptions {
32-
jvmTarget = JavaVersion.VERSION_17.toString()
34+
jvmTarget = JavaVersion.VERSION_11.toString()
3335
}
3436
}
3537

0 commit comments

Comments
 (0)