ANDROID-16633 Update AGP (#452)

jdelga · web-flow · commit 4c72ea2f5a23 · 2025-09-01T12:16:48.000+02:00
* ANDROID-16633 make * Add custom lint config * Remove lint custom and use default
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.android.application'
+    alias libs.plugins.com.android.application
     id 'org.jetbrains.kotlin.android'
 }
 
diff --git a/app/lint.xml b/app/lint.xml
@@ -5,6 +5,7 @@
     <issue id="OldTargetApi" severity="ignore" />
     <issue id="MonochromeLauncherIcon" severity="ignore" />
     <issue id="GradleDependency" severity="ignore" />
+    <issue id="AndroidGradlePluginVersion" severity="ignore" />
 
     <!-- Required for firebase distribution tracks, nodpi assets should be included also. -->
     <issue id="UnusedResources">
@@ -15,4 +16,6 @@
     <issue id="IconLauncherShape">
         <ignore path="src/main/res/mipmap-nodpi/ic_launcher*.png" />
     </issue>
+    <issue id="UseTomlInstead" severity="ignore" />
+
 </lint>
diff --git a/build.gradle b/build.gradle
@@ -22,7 +22,6 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.9.3"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detekt_version"
     }
@@ -33,6 +32,9 @@ plugins {
     id 'org.jetbrains.kotlin.plugin.compose' version "$kotlin_version" apply false
     id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
     id "io.github.takahirom.roborazzi" version '1.26.0' apply false
+    alias libs.plugins.com.android.application apply false
+    alias libs.plugins.com.android.library apply false
+
     id "io.gitlab.arturbosch.detekt" version '1.23.7'
 }
 
diff --git a/catalog/build.gradle b/catalog/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.android.library'
+    alias libs.plugins.com.android.library
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-kapt'
     id 'maven-publish'
diff --git a/catalog/lint.xml b/catalog/lint.xml
@@ -28,4 +28,6 @@
     </issue>
     <issue id="OldTargetApi" severity="ignore" />
     <issue id="GradleDependency" severity="ignore" />
+    <issue id="UseTomlInstead" severity="ignore" />
+
 </lint>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,8 @@
+[versions]
+android-gradle-plugin = "8.11.1"
+
+[libraries]
+
+[plugins]
+com-android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }
+com-android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Mar 07 14:21:40 CET 2025
+#Fri Aug 08 12:17:49 CEST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/library-test-utils/build.gradle b/library-test-utils/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.android.library'
+    alias libs.plugins.com.android.library
     id 'org.jetbrains.kotlin.android'
     id 'org.jetbrains.kotlin.plugin.compose'
 }
diff --git a/library/build.gradle b/library/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.android.library'
+    alias libs.plugins.com.android.library
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-kapt'
     id 'maven-publish'
diff --git a/library/lint.xml b/library/lint.xml
@@ -9,4 +9,6 @@
     </issue>
     <issue id="OldTargetApi" severity="ignore" />
     <issue id="GradleDependency" severity="ignore" />
+    <issue id="UseTomlInstead" severity="ignore" />
+
 </lint>
diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,14 @@
+pluginManagement {
+    repositories {
+        mavenCentral()
+        google()
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+        gradlePluginPortal()
+    }
+}
+
 include ':app'
 include ':library'
 include ':catalog'

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id 'com.android.application'`
	`2`	`+ alias libs.plugins.com.android.application`
`3`	`3`	`id 'org.jetbrains.kotlin.android'`
`4`	`4`	`}`
`5`	`5`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ buildscript {`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`dependencies {`
`25`		`- classpath "com.android.tools.build:gradle:8.9.3"`
`26`	`25`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`27`	`26`	`classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detekt_version"`
`28`	`27`	`}`
`@@ -33,6 +32,9 @@ plugins {`
`33`	`32`	`id 'org.jetbrains.kotlin.plugin.compose' version "$kotlin_version" apply false`
`34`	`33`	`id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false`
`35`	`34`	`id "io.github.takahirom.roborazzi" version '1.26.0' apply false`
	`35`	`+ alias libs.plugins.com.android.application apply false`
	`36`	`+ alias libs.plugins.com.android.library apply false`
	`37`	`+`
`36`	`38`	`id "io.gitlab.arturbosch.detekt" version '1.23.7'`
`37`	`39`	`}`
`38`	`40`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id 'com.android.library'`
	`2`	`+ alias libs.plugins.com.android.library`
`3`	`3`	`id 'org.jetbrains.kotlin.android'`
`4`	`4`	`id 'org.jetbrains.kotlin.plugin.compose'`
`5`	`5`	`}`