Merge pull request #1357 from android/wff-agp

garanj · web-flow · commit 1f869c51c7b4 · 2026-01-30T09:32:30.000Z
Migrated to AGP 9.0.0
diff --git a/WatchFaceFormat/Complications/gradle/libs.versions.toml b/WatchFaceFormat/Complications/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-androidGradlePlugin = "8.13.1"
+androidGradlePlugin = "9.0.0"
 
 [plugins]
-android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
+android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
diff --git a/WatchFaceFormat/Complications/watchface/build.gradle.kts b/WatchFaceFormat/Complications/watchface/build.gradle.kts
@@ -18,6 +18,7 @@ plugins {
 }
 
 android {
+    enableKotlin = false
     namespace = "com.example.complications"
     compileSdk = 34
 
diff --git a/WatchFaceFormat/Flavors/gradle/libs.versions.toml b/WatchFaceFormat/Flavors/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-androidGradlePlugin = "8.13.1"
+androidGradlePlugin = "9.0.0"
 
 [plugins]
-android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
+android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
diff --git a/WatchFaceFormat/Flavors/watchface/build.gradle.kts b/WatchFaceFormat/Flavors/watchface/build.gradle.kts
@@ -18,6 +18,7 @@ plugins {
 }
 
 android {
+    enableKotlin = false
     namespace = "com.example.flavors"
     compileSdk = 34
 
diff --git a/WatchFaceFormat/PhotosMask/build.gradle.kts b/WatchFaceFormat/PhotosMask/build.gradle.kts
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
  plugins {
-    id("com.android.application") version "8.13.1" apply false
+    alias(libs.plugins.android.application) apply false
 }
diff --git a/WatchFaceFormat/PhotosMask/gradle/libs.versions.toml b/WatchFaceFormat/PhotosMask/gradle/libs.versions.toml
@@ -0,0 +1,5 @@
+[versions]
+androidGradlePlugin = "9.0.0"
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
diff --git a/WatchFaceFormat/PhotosMask/watchface/build.gradle.kts b/WatchFaceFormat/PhotosMask/watchface/build.gradle.kts
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 plugins {
-    id("com.android.application")
+    alias(libs.plugins.android.application)
 }
 
 android {
+    enableKotlin = false
     namespace = "com.example.photosmask"
     compileSdk = 36
 
diff --git a/WatchFaceFormat/PhotosMulti/build.gradle.kts b/WatchFaceFormat/PhotosMulti/build.gradle.kts
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
  plugins {
-    id("com.android.application") version "8.13.1" apply false
+    alias(libs.plugins.android.application) apply false
 }
diff --git a/WatchFaceFormat/PhotosMulti/gradle/libs.versions.toml b/WatchFaceFormat/PhotosMulti/gradle/libs.versions.toml
@@ -0,0 +1,5 @@
+[versions]
+androidGradlePlugin = "9.0.0"
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
diff --git a/WatchFaceFormat/PhotosMulti/watchface/build.gradle.kts b/WatchFaceFormat/PhotosMulti/watchface/build.gradle.kts
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 plugins {
-    id("com.android.application")
+    alias(libs.plugins.android.application)
 }
 
 android {
+    enableKotlin = false
     namespace = "com.example.photosmulti"
     compileSdk = 36
 
diff --git a/WatchFaceFormat/SimpleAnalog/gradle/libs.versions.toml b/WatchFaceFormat/SimpleAnalog/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-androidGradlePlugin = "8.13.1"
+androidGradlePlugin = "9.0.0"
 
 [plugins]
-android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
+android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
diff --git a/WatchFaceFormat/SimpleAnalog/watchface/build.gradle.kts b/WatchFaceFormat/SimpleAnalog/watchface/build.gradle.kts
@@ -18,6 +18,7 @@ plugins {
 }
 
 android {
+    enableKotlin = false
     namespace = "com.example.simpleanalog"
     compileSdk = 33
 
diff --git a/WatchFaceFormat/SimpleDigital/gradle/libs.versions.toml b/WatchFaceFormat/SimpleDigital/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-androidGradlePlugin = "8.13.1"
+androidGradlePlugin = "9.0.0"
 
 [plugins]
-android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
+android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
diff --git a/WatchFaceFormat/SimpleDigital/watchface/build.gradle.kts b/WatchFaceFormat/SimpleDigital/watchface/build.gradle.kts
@@ -18,6 +18,7 @@ plugins {
 }
 
 android {
+    enableKotlin = false
     namespace = "com.example.simpledigital"
     compileSdk = 33
 
diff --git a/WatchFaceFormat/Weather/gradle/libs.versions.toml b/WatchFaceFormat/Weather/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-androidGradlePlugin = "8.13.1"
+androidGradlePlugin = "9.0.0"
 
 [plugins]
-android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
+android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
diff --git a/WatchFaceFormat/Weather/watchface/build.gradle.kts b/WatchFaceFormat/Weather/watchface/build.gradle.kts
@@ -18,6 +18,7 @@ plugins {
 }
 
 android {
+    enableKotlin = false
     namespace = "com.example.weather"
     compileSdk = 34
 

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ plugins {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`android {`
	`21`	`+ enableKotlin = false`
`21`	`22`	`namespace = "com.example.complications"`
`22`	`23`	`compileSdk = 34`
`23`	`24`
Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,5 @@`
`14`	`14`	`* limitations under the License.`
`15`	`15`	`*/`
`16`	`16`	`plugins {`
`17`		`- id("com.android.application") version "8.13.1" apply false`
	`17`	`+ alias(libs.plugins.android.application) apply false`
`18`	`18`	`}`