Merge "[gradle] Upgrade to Kotlin 2.0.21" into main (98d2c580) · Commits · e / os / android_frameworks_base

packages/SettingsLib/Spa/build.gradle.kts

+1 −21

Original line number	Diff line number	Diff line
		@@ -14,14 +14,13 @@
		* limitations under the License.
		*/

		import com.android.build.api.dsl.CommonExtension
		import com.android.build.gradle.BaseExtension
		import com.android.build.gradle.api.AndroidBasePlugin
		import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

		plugins {
		alias(libs.plugins.android.application) apply false
		alias(libs.plugins.android.library) apply false
		alias(libs.plugins.compose.compiler) apply false
		alias(libs.plugins.kotlin.android) apply false
		}

		@@ -51,23 +50,4 @@ subprojects {
		}
		}
		}

		afterEvaluate {
		plugins.withType<AndroidBasePlugin> {
		the(CommonExtension::class).apply {
		if (buildFeatures.compose == true) {
		composeOptions {
		kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
		}
		}
		}
		}
		}

		tasks.withType<KotlinCompile> {
		kotlinOptions {
		jvmTarget = libs.versions.jvm.get()
		freeCompilerArgs = listOf("-Xjvm-default=all")
		}
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		plugins {
		alias(libs.plugins.android.application)
		alias(libs.plugins.compose.compiler)
		alias(libs.plugins.kotlin.android)
		}

+4 −4

Original line number	Diff line number	Diff line
		@@ -15,12 +15,11 @@
		#

		[versions]
		agp = "8.7.2"
		compose-compiler = "1.5.11"
		agp = "8.7.3"
		dexmaker-mockito = "2.28.3"
		jvm = "17"
		kotlin = "1.9.23"
		truth = "1.1.5"
		kotlin = "2.0.21"
		truth = "1.4.4"

		[libraries]
		dexmaker-mockito = { module = "com.linkedin.dexmaker:dexmaker-mockito", version.ref = "dexmaker-mockito" }
		@@ -29,4 +28,5 @@ truth = { module = "com.google.truth:truth", version.ref = "truth" }
		[plugins]
		android-application = { id = "com.android.application", version.ref = "agp" }
		android-library = { id = "com.android.library", version.ref = "agp" }
		compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
		kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }

+2 −4

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		plugins {
		alias(libs.plugins.android.library)
		alias(libs.plugins.compose.compiler)
		alias(libs.plugins.kotlin.android)
		jacoco
		}
		@@ -41,9 +42,6 @@ android {
		manifest.srcFile("../tests/AndroidManifest.xml")
		}
		}
		buildFeatures {
		compose = true
		}
		buildTypes {
		getByName("debug") {
		enableAndroidTestCoverage = true
		@@ -63,7 +61,7 @@ dependencies {
		api("androidx.lifecycle:lifecycle-runtime-compose")
		api("androidx.navigation:navigation-compose:2.9.0-alpha03")
		api("com.github.PhilJay:MPAndroidChart:v3.1.0-alpha")
		api("com.google.android.material:material:1.12.0")
		api("com.google.android.material:material:1.13.0-alpha08")
		debugApi("androidx.compose.ui:ui-tooling:$jetpackComposeVersion")
		implementation("com.airbnb.android:lottie-compose:6.4.0")

+1 −3

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		plugins {
		alias(libs.plugins.android.library)
		alias(libs.plugins.compose.compiler)
		alias(libs.plugins.kotlin.android)
		}

		@@ -30,9 +31,6 @@ android {
		manifest.srcFile("AndroidManifest.xml")
		}
		}
		buildFeatures {
		compose = true
		}
		}

		dependencies {