Skip to content

Commit c0d4032

Browse files
committed
build: migrate to AGP 9 built-in Kotlin support
AGP 9 provides Kotlin support natively and refuses to configure a module that still applies org.jetbrains.kotlin.android alongside it. Removes that plugin (all its declaration styles: catalog alias, kotlin("android"), and hardcoded id(...)) from every module actually wired into settings.gradle.kts, and drops the now-unused kotlin-android catalog entry. Also fixes two things AGP 9 surfaced as hard errors during configuration, unrelated to the plugin removal itself: - ApiDemos:java-app had a vestigial buildFeatures.compose = true with no Kotlin sources or Compose dependencies; AGP 9 now requires the Compose Compiler plugin whenever compose is enabled, so the dead flag is removed instead. - tutorials/kotlin/Polygons used the now-unsupported proguard-android.txt default file, replaced with proguard-android-optimize.txt. Standalone tutorial/sample directories not wired into settings.gradle.kts (app-rx, the java/ and duplicate kotlin/ tutorial folders) are untouched since they aren't part of the actual build graph or CI.
1 parent 8ef5b6a commit c0d4032

17 files changed

Lines changed: 1 addition & 18 deletions

File tree

ApiDemos/project/common-ui/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
1818

1919
plugins {
2020
alias(libs.plugins.android.library)
21-
alias(libs.plugins.kotlin.android)
2221
}
2322

2423
android {

ApiDemos/project/java-app/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ android {
3434
}
3535

3636
buildFeatures {
37-
compose = true
3837
buildConfig = true
3938
viewBinding = true
4039
}

ApiDemos/project/kotlin-app/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
1818

1919
plugins {
2020
alias(libs.plugins.android.application)
21-
alias(libs.plugins.kotlin.android)
2221
alias(libs.plugins.kotlin.parcelize)
2322
alias(libs.plugins.secrets.gradle.plugin)
2423
}

FireMarkers/app/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ plugins {
2222
// Compose. They handle the core compilation, packaging, and resource processing.
2323
// ---------------------------------------------------------------------------------------------
2424
alias(libs.plugins.android.application) // Applies the core Android application plugin.
25-
alias(libs.plugins.kotlin.android) // Enables Kotlin language support for Android.
2625
alias(libs.plugins.kotlin.compose) // Provides support for the Jetpack Compose compiler.
2726

2827
// ---------------------------------------------------------------------------------------------

FireMarkers/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
// Top-level build file where you can add configuration options common to all sub-projects/modules.
1818
plugins {
1919
alias(libs.plugins.android.application) apply false
20-
alias(libs.plugins.kotlin.android) apply false
2120
alias(libs.plugins.kotlin.compose) apply false
2221

2322
alias(libs.plugins.hilt.android) apply false

WearOS/Wearable/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
plugins {
1818
id("com.android.application")
1919
id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
20-
kotlin("android") // The Kotlin plugin is applied differently in Kotlin DSL
2120
}
2221

2322
android {

WearOS/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,4 @@
1717
plugins {
1818
alias(libs.plugins.android.application) apply false
1919
alias(libs.plugins.secrets.gradle.plugin) apply false
20-
alias(libs.plugins.kotlin.android) apply false
2120
}

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
plugins {
1818
alias(libs.plugins.android.application) apply false
1919
alias(libs.plugins.android.library) apply false
20-
alias(libs.plugins.kotlin.android) apply false
2120
alias(libs.plugins.kotlin.parcelize) apply false
2221
alias(libs.plugins.secrets.gradle.plugin) apply false
2322
alias(libs.plugins.hilt.android) apply false

gradle/libs.versions.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ volley = { group = "com.android.volley", name = "volley", version.ref = "volley"
143143
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
144144
android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
145145
hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
146-
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
147146
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
148147
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
149148
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

snippets/app-compose/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
plugins {
1818
alias(libs.plugins.android.application)
19-
alias(libs.plugins.kotlin.android)
2019
alias(libs.plugins.kotlin.compose)
2120
alias(libs.plugins.secrets.gradle.plugin)
2221
}

0 commit comments

Comments
 (0)