Skip to content

Commit 9759a02

Browse files
committed
REMOVE kotlin-android plugin and use builtin-kotlin
1 parent 49db99d commit 9759a02

6 files changed

Lines changed: 0 additions & 10 deletions

build.dep.compose.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
apply plugin: 'kotlin-android'
2-
31
android {
42
buildFeatures {
53
compose = true

build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ buildscript {
1414
plugins { // sets class paths only (because of 'apply false')
1515
alias libs.plugins.androidApplication apply false
1616
alias libs.plugins.androidLibrary apply false
17-
alias libs.plugins.jetbrainsKotlinAndroid apply false
1817
alias libs.plugins.kotlinSerialization apply false
1918
alias libs.plugins.googleServices apply false
2019
alias libs.plugins.firebaseCrashlyticsPlugin apply false

build.module.feature-and-app.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
apply plugin: 'kotlin-android'
2-
31
apply from: "$rootDir/build.config.jvm.gradle"
42
apply from: "$rootDir/build.dep.di.gradle"
53
apply from: "$rootDir/build.dep.compose.gradle"

build.module.library.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
apply plugin: 'kotlin-android'
2-
31
apply from: "$rootDir/build.config.jvm.gradle"
42
apply from: "$rootDir/build.dep.di.gradle"
53

gradle.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ android.dependency.useConstraints=true
3333
# AGP 9.x enables R8 strict full mode by default; keeping false avoids failures from non-conforming third-party keep rules.
3434
android.r8.strictFullModeForKeepRules=false
3535

36-
# Kotlin is applied via the kotlin-android plugin; must be false to avoid conflicts with AGP's built-in Kotlin support.
37-
android.builtInKotlin=false
3836

3937
# Project uses Groovy DSL; enabling the new DSL would break existing build scripts.
4038
android.newDsl=false

gradle/libs.versions.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ plugin-licensee = { module = "app.cash.licensee:licensee-gradle-plugin", version
5858
androidApplication = { id = "com.android.application", version.ref = "gradlePlugin" }
5959
androidLibrary = { id = "com.android.library", version.ref = "gradlePlugin" }
6060
kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
61-
jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
6261
googleServices = { id = "com.google.gms.google-services", version.ref = "googleServices" }
6362
firebaseCrashlyticsPlugin = { id = "com.google.firebase.crashlytics", version.ref = "crashlyticsPlugin" }
6463
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

0 commit comments

Comments
 (0)