Upgrade AGP, Gradle and Kotlin

Gopalakrishnan Iyer · Gopalakrishnan Iyer · commit 5e891457618b · 2025-01-29T21:29:14.000-07:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -69,6 +69,9 @@ android {
             dimension = "version"
         }
     }
+    lint {
+        baseline = file("lint-baseline.xml")
+    }
 }
 
 dependencies {
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,13 +1,19 @@
 buildscript {
     extra.apply {
-        set("kotlin_version", "1.9.22")
+        set("kotlin_version", "2.1.0")
     }
     repositories {
-        google()
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.7.3")
+        classpath("com.android.tools.build:gradle:8.8.0")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.extra["kotlin_version"]}")
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 #Mon Oct 21 22:01:46 CDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,2 +1,2 @@
 include(":app")
-rootProject.name = "Watomatic"
+rootProject.name = "Watomatic"

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,9 @@ android {`
`69`	`69`	`dimension = "version"`
`70`	`70`	`}`
`71`	`71`	`}`
	`72`	`+ lint {`
	`73`	`+ baseline = file("lint-baseline.xml")`
	`74`	`+ }`
`72`	`75`	`}`
`73`	`76`
`74`	`77`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`include(":app")`
`2`		`-rootProject.name = "Watomatic"`
	`2`	`+rootProject.name = "Watomatic"`