A fully functional Android app built entirely with Kotlin and Jetpack Compose
Adjust JDK setup to remove toolchain
Alex Vanyo76b0b0812146
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.ktsindex 571ba8c2f..097702347 100644--- a/build-logic/convention/build.gradle.kts+++ b/build-logic/convention/build.gradle.kts@@ -22,16 +22,15 @@ plugins {group = "com.google.samples.apps.nowinandroid.buildlogic"+// Configure the build-logic plugins to target JDK 17+// This matches the JDK used to build the project, and is not related to what is running on device.java {- // Up to Java 11 APIs are available through desugaring- // https://developer.android.com/studio/write/java11-minimal-support-table- 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()}}@@ -93,5 +92,9 @@ gradlePlugin {id = "nowinandroid.android.application.flavors"implementationClass = "AndroidApplicationFlavorsConventionPlugin"}+ register("jvmLibrary") {+ id = "nowinandroid.jvm.library"+ implementationClass = "JvmLibraryConventionPlugin"+ }}}diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.ktindex 0e2eaa397..26b6951d3 100644--- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt@@ -18,7 +18,6 @@ import com.android.build.api.dsl.ApplicationExtensionimport com.google.samples.apps.nowinandroid.configureGradleManagedDevicesimport com.android.build.api.variant.ApplicationAndroidComponentsExtensionimport 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,7 +31,6 @@ 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 2ffeae974..275a26620 100644--- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt@@ -19,7 +19,6 @@ 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 com.google.samples.apps.nowinandroid.disableUnnecessaryAndroidTestsimport org.gradle.api.Plugin@@ -38,7 +37,6 @@ 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/JvmLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.ktnew file mode 100644index 000000000..4067e289b--- /dev/null+++ b/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt@@ -0,0 +1,30 @@+/*+ * Copyright 2023 The Android Open Source Project+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * https://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import com.google.samples.apps.nowinandroid.configureKotlinJvm+import org.gradle.api.Plugin+import org.gradle.api.Project++class JvmLibraryConventionPlugin : Plugin<Project> {+ override fun apply(target: Project) {+ with(target) {+ with(pluginManager) {+ apply("org.jetbrains.kotlin.jvm")+ }+ configureKotlinJvm()+ }+ }+}diff --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 fd32255fd..43edd53ec 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@@ -16,11 +16,13 @@package com.google.samples.apps.nowinandroid+import com.android.build.api.dsl.ApplicationExtensionimport com.android.build.api.dsl.CommonExtensionimport org.gradle.api.JavaVersionimport org.gradle.api.Projectimport org.gradle.api.artifacts.VersionCatalogsExtensionimport org.gradle.api.plugins.ExtensionAware+import org.gradle.api.plugins.JavaPluginExtensionimport org.gradle.kotlin.dsl.configureimport org.gradle.kotlin.dsl.dependenciesimport org.gradle.kotlin.dsl.getByType@@ -52,6 +54,33 @@ internal fun Project.configureKotlinAndroid(}}+ configureKotlin()++ val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")++ dependencies {+ add("coreLibraryDesugaring", libs.findLibrary("android.desugarJdkLibs").get())+ }+}++/**+ * Configure base Kotlin options for JVM (non-Android)+ */+internal fun Project.configureKotlinJvm() {+ extensions.configure<JavaPluginExtension> {+ // Up to Java 11 APIs are available through desugaring+ // https://developer.android.com/studio/write/java11-minimal-support-table+ sourceCompatibility = JavaVersion.VERSION_11+ targetCompatibility = JavaVersion.VERSION_11+ }++ configureKotlin()+}++/**+ * Configure base Kotlin options+ */+private fun Project.configureKotlin() {// Use withType to workaround https://youtrack.jetbrains.com/issue/KT-55947tasks.withType<KotlinCompile>().configureEach {kotlinOptions {@@ -69,23 +98,4 @@ internal fun Project.configureKotlinAndroid()}}-- val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")-- dependencies {- add("coreLibraryDesugaring", libs.findLibrary("android.desugarJdkLibs").get())- }-}--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)- }}diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.ktsindex 67ecf9006..55b49beb7 100644--- a/core/model/build.gradle.kts+++ b/core/model/build.gradle.kts@@ -15,13 +15,9 @@*/plugins {- id("kotlin")-}--kotlin {- jvmToolchain(11)+ id("nowinandroid.jvm.library")}dependencies {implementation(libs.kotlinx.datetime)-}\ No newline at end of file+}