A fully functional Android app built entirely with Kotlin and Jetpack Compose
Configure jvmToolchain for Android projects
Simon Marquisea7bcf33c594
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.ktindex 6bc5f9f9e..e0efe511b 100644--- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt@@ -19,6 +19,7 @@ import com.android.build.api.dsl.ApplicationExtensionimport com.google.samples.apps.nowinandroid.configureFlavorsimport com.google.samples.apps.nowinandroid.configureGradleManagedDevicesimport com.google.samples.apps.nowinandroid.configureKotlinAndroid+import com.google.samples.apps.nowinandroid.configureKotlinAndroidToolchainimport com.google.samples.apps.nowinandroid.configurePrintApksTaskimport org.gradle.api.Pluginimport org.gradle.api.Project@@ -32,6 +33,7 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {apply("org.jetbrains.kotlin.android")}+ configureKotlinAndroidToolchain()extensions.configure<ApplicationExtension> {configureKotlinAndroid(this)defaultConfig.targetSdk = 33diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.ktindex 842873bae..c0e269243 100644--- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt@@ -20,6 +20,7 @@ import com.android.build.gradle.LibraryExtensionimport com.google.samples.apps.nowinandroid.configureFlavorsimport com.google.samples.apps.nowinandroid.configureGradleManagedDevicesimport com.google.samples.apps.nowinandroid.configureKotlinAndroid+import com.google.samples.apps.nowinandroid.configureKotlinAndroidToolchainimport com.google.samples.apps.nowinandroid.configurePrintApksTaskimport org.gradle.api.Pluginimport org.gradle.api.Project@@ -37,6 +38,7 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {apply("org.jetbrains.kotlin.android")}+ configureKotlinAndroidToolchain()extensions.configure<LibraryExtension> {configureKotlinAndroid(this)defaultConfig.targetSdk = 33diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.ktindex da0cab531..2b5d1c354 100644--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt@@ -21,9 +21,11 @@ import org.gradle.api.JavaVersionimport org.gradle.api.Projectimport org.gradle.api.artifacts.VersionCatalogsExtensionimport org.gradle.api.plugins.ExtensionAware+import org.gradle.kotlin.dsl.configureimport org.gradle.kotlin.dsl.dependenciesimport org.gradle.kotlin.dsl.getByTypeimport org.gradle.kotlin.dsl.provideDelegate+import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtensionimport org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions/**@@ -74,3 +76,12 @@ internal fun Project.configureKotlinAndroid(fun CommonExtension<*, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {(this as ExtensionAware).extensions.configure("kotlinOptions", block)}++/**+ * Configure Kotlin's jvm toolchain for Android projects+ */+internal fun Project.configureKotlinAndroidToolchain() {+ extensions.configure<KotlinAndroidProjectExtension> {+ jvmToolchain(11)+ }+}