Migrate to Android Gradle Plugin 9

2026-03-28 16:02:54 +01:00
parent dfad063811
commit 37fa1697dd
59 changed files with 31 additions and 179 deletions
--- a/data/applications/build.gradle.kts
+++ b/data/applications/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 plugins {
    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }

 android {
--- a/data/appshortcuts/build.gradle.kts
+++ b/data/appshortcuts/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 plugins {
    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }

 android {
--- a/data/calculator/build.gradle.kts
+++ b/data/calculator/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 plugins {
    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }

 android {
--- a/data/calendar/build.gradle.kts
+++ b/data/calendar/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 plugins {
    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
    alias(libs.plugins.kotlin.plugin.serialization)
 }

--- a/data/contacts/build.gradle.kts
+++ b/data/contacts/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 plugins {
    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }

 android {
--- a/data/currencies/build.gradle.kts
+++ b/data/currencies/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 plugins {
    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }

 android {
--- a/data/customattrs/build.gradle.kts
+++ b/data/customattrs/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 plugins {
    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }

 android {
--- a/data/database/build.gradle.kts
+++ b/data/database/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 plugins {
    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
    alias(libs.plugins.ksp)
    alias(libs.plugins.kotlin.plugin.serialization)
 }
--- a/data/files/build.gradle.kts
+++ b/data/files/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 plugins {
    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
    alias(libs.plugins.kotlin.plugin.serialization)
 }

--- a/data/i18n/build.gradle.kts
+++ b/data/i18n/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 plugins {
    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
    alias(libs.plugins.kotlin.plugin.serialization)
 }

--- a/data/locations/build.gradle.kts
+++ b/data/locations/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 plugins {
    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
    alias(libs.plugins.kotlin.plugin.serialization)
 }

--- a/data/notifications/build.gradle.kts
+++ b/data/notifications/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 plugins {
    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }

 android {
--- a/data/plugins/build.gradle.kts
+++ b/data/plugins/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 plugins {
    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }

 android {
--- a/data/search-actions/build.gradle.kts
+++ b/data/search-actions/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 plugins {
    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }

 android {
--- a/data/search-actions/consumer-rules.pro
+++ b/data/search-actions/consumer-rules.pro
@@ -0,0 +1,3 @@
+# This is generated automatically by the Android Gradle plugin.
+-dontwarn com.google.re2j.Matcher
+-dontwarn com.google.re2j.Pattern
--- a/data/searchable/build.gradle.kts
+++ b/data/searchable/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 plugins {
    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }

 android {
--- a/data/themes/build.gradle.kts
+++ b/data/themes/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 plugins {
    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
    alias(libs.plugins.kotlin.plugin.serialization)
 }

--- a/data/unitconverter/build.gradle.kts
+++ b/data/unitconverter/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 plugins {
    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }

 android {
--- a/data/weather/build.gradle.kts
+++ b/data/weather/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 plugins {
    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
    alias(libs.plugins.kotlin.plugin.serialization)
 }

--- a/data/websites/build.gradle.kts
+++ b/data/websites/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 plugins {
    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }

 android {
--- a/data/websites/consumer-rules.pro
+++ b/data/websites/consumer-rules.pro
@@ -0,0 +1,3 @@
+# This is generated automatically by the Android Gradle plugin.
+-dontwarn com.google.re2j.Matcher
+-dontwarn com.google.re2j.Pattern
--- a/data/widgets/build.gradle.kts
+++ b/data/widgets/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 plugins {
    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
    alias(libs.plugins.kotlin.plugin.serialization)
 }

--- a/data/wikipedia/build.gradle.kts
+++ b/data/wikipedia/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

 plugins {
    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
    alias(libs.plugins.kotlin.plugin.serialization)
 }