From e3671cd79913c236b07ec6f4395cc75901922c31 Mon Sep 17 00:00:00 2001
From: Aurimas Liutikas <aurimas@google.com>
Date: Mon, 6 Jul 2026 11:17:44 -0700
Subject: [PATCH 1/3] Upgrade Gradle, AGP, and licenses plugins

- Upgradle to 9.6.1
- AGP to 9.2.1
- Oss license plugin 0.12.0

Test: ./gradlew build
---
 app/build.gradle.kts                     | 5 +++--
 app/src/main/AndroidManifest.xml         | 3 ++-
 gradle.properties                        | 5 +----
 gradle/libs.versions.toml                | 4 ++--
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 2f0253943..febbf2379 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -53,8 +53,6 @@ android {
             // who clones the code to sign and run the release variant, use the debug signing key.
             // TODO: Abstract the signing configuration to a separate file to avoid hardcoding this.
             signingConfig = signingConfigs.named("debug").get()
-            // Ensure Baseline Profile is fresh for release builds.
-            baselineProfile.automaticGenerationDuringBuild = true
         }
     }
 
@@ -67,6 +65,9 @@ android {
     namespace = "com.google.samples.apps.nowinandroid"
 }
 
+// Ensure Baseline Profile is fresh for release builds.
+baselineProfile.automaticGenerationDuringBuild = true
+
 dependencies {
     implementation(projects.feature.interests.api)
     implementation(projects.feature.interests.impl)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index af3534342..7ac8359b4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,7 +36,8 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Nia.Splash">
+        android:theme="@style/Theme.Nia.Splash"
+        tools:replace="android:theme">
         <profileable android:shell="true" tools:targetApi="q" />
 
         <activity
diff --git a/gradle.properties b/gradle.properties
index 33e5ba0c2..d933fc6cb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -40,10 +40,7 @@ org.gradle.caching=true
 # Enable configuration caching between builds.
 org.gradle.configuration-cache=true
 org.gradle.configuration-cache.parallel=true
-# This option is set because of https://github.com/google/play-services-plugins/issues/246
-# to generate the Configuration Cache regardless of incompatible tasks.
-# See https://github.com/android/nowinandroid/issues/1022 before using it.
-org.gradle.configuration-cache.problems=warn
+org.gradle.configuration-cache.problems=fail
 
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app"s APK
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 16123b7f6..ae906034c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 accompanist = "0.37.0"
 androidDesugarJdkLibs = "2.1.4"
 # AGP and tools should be updated together
-androidGradlePlugin = "9.0.0"
+androidGradlePlugin = "9.2.1"
 androidTools = "32.0.0"
 androidxActivity = "1.9.3"
 androidxAppCompat = "1.7.0"
@@ -41,7 +41,7 @@ firebaseCrashlyticsPlugin = "3.0.6"
 firebasePerfPlugin = "2.0.2"
 gmsPlugin = "4.4.4"
 googleOss = "17.1.0"
-googleOssPlugin = "0.10.9"
+googleOssPlugin = "0.12.0"
 hilt = "2.59"
 hiltExt = "1.2.0"
 jacoco = "0.8.12"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 92ed94347..da32a7e2e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=60ea723356d81263e8002fec0fcf9e2b0eee0c0850c7a3d7ab0a63f2ccc601f3
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
+distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From f27d4db659574c0d5c6059877e261467e26ca021 Mon Sep 17 00:00:00 2001
From: Aurimas Liutikas <aurimas@google.com>
Date: Tue, 7 Jul 2026 15:37:36 -0700
Subject: [PATCH 2/3] Fix up gemini found issues

- bump tools version
- use variants API within baselineProfile block
---
 app/build.gradle.kts      | 6 +++++-
 gradle/libs.versions.toml | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index febbf2379..bcc1720bf 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -66,7 +66,11 @@ android {
 }
 
 // Ensure Baseline Profile is fresh for release builds.
-baselineProfile.automaticGenerationDuringBuild = true
+baselineProfile {
+    variants.getByName("release") {
+        automaticGenerationDuringBuild = true
+    }
+}
 
 dependencies {
     implementation(projects.feature.interests.api)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ae906034c..7769f6d28 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ accompanist = "0.37.0"
 androidDesugarJdkLibs = "2.1.4"
 # AGP and tools should be updated together
 androidGradlePlugin = "9.2.1"
-androidTools = "32.0.0"
+androidTools = "32.2.1"
 androidxActivity = "1.9.3"
 androidxAppCompat = "1.7.0"
 androidxBrowser = "1.8.0"

From 557b1b20925d803b0c8423ea22441ecc2bda7a84 Mon Sep 17 00:00:00 2001
From: Aurimas Liutikas <aurimas@google.com>
Date: Wed, 8 Jul 2026 15:12:54 -0700
Subject: [PATCH 3/3] Follow Rahul's advice on setup

---
 app/build.gradle.kts | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index bcc1720bf..2ba230387 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -65,13 +65,6 @@ android {
     namespace = "com.google.samples.apps.nowinandroid"
 }
 
-// Ensure Baseline Profile is fresh for release builds.
-baselineProfile {
-    variants.getByName("release") {
-        automaticGenerationDuringBuild = true
-    }
-}
-
 dependencies {
     implementation(projects.feature.interests.api)
     implementation(projects.feature.interests.impl)
@@ -150,6 +143,11 @@ baselineProfile {
 
     // Make use of Dex Layout Optimizations via Startup Profiles
     dexLayoutOptimization = true
+
+    // Ensure Baseline Profile is fresh for release builds.
+    variants.create("release") {
+        automaticGenerationDuringBuild = true
+    }
 }
 
 dependencyGuard {