Bump Deps and AGP 9

ai/sample/core-proto/build.gradle.kts

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2026 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("java-library")
+    id("com.google.protobuf")
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+protobuf {
+    protoc {
+        artifact = libs.protobuf.protoc.stnd.get().toString()
+    }
+    plugins {
+        create("javalite") {
+            artifact = libs.protobuf.protoc.gen.javalite.get().toString()
+        }
+        create("grpc") {
+            artifact = libs.protobuf.protoc.gen.grpc.java.get().toString()
+        }
+        create("grpckt") {
+            artifact = libs.protobuf.protoc.gen.grpc.kotlin.get().toString()
+        }
+    }
+    generateProtoTasks {
+        all().forEach { task ->
+            task.builtins {
+                named("java") {
+                    option("lite")
+                }
+                create("kotlin") {
+                    option("lite")
+                }
+            }
+            task.plugins {
+                create("grpc") {
+                    option("lite")
+                }
+                create("grpckt") {
+                    option("lite")
+                }
+            }
+        }
+    }
+}
+
+dependencies {
+    api(libs.protobuf.kotlin.lite)
+    api(libs.io.grpc.protobuf.lite)
+    api(libs.io.grpc.grpc.kotlin)
+    api(libs.grpc.stub)
+}

ai/sample/core/build.gradle.kts

@@ -16,8 +16,7 @@
 
 plugins {
     id("com.android.library")
-    id("com.google.protobuf")
-    kotlin("android")
+
     id("com.google.devtools.ksp")
     id("dagger.hilt.android.plugin")
 }
@@ -40,14 +39,6 @@ android {
         buildConfig = false
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.majorVersion
-        freeCompilerArgs = freeCompilerArgs +
-            listOf(
-                "-opt-in=kotlin.RequiresOptIn",
-                "-opt-in=com.google.android.horologist.annotations.ExperimentalHorologistApi",
-            )
-    }
     packaging {
         resources {
             excludes +=
@@ -72,45 +63,9 @@ android {
     namespace = "com.google.android.horologist.ai.sample.core"
 }
 
-protobuf {
-    protoc {
-        artifact = libs.protobuf.protoc.stnd.get().toString()
-    }
-    plugins {
-        create("javalite") {
-            artifact = libs.protobuf.protoc.gen.javalite.get().toString()
-        }
-        create("grpc") {
-            artifact = libs.protobuf.protoc.gen.grpc.java.get().toString()
-        }
-        create("grpckt") {
-            artifact = libs.protobuf.protoc.gen.grpc.kotlin.get().toString()
-        }
-    }
-    generateProtoTasks {
-        all().forEach { task ->
-            task.builtins {
-                create("java") {
-                    option("lite")
-                }
-                create("kotlin") {
-                    option("lite")
-                }
-            }
-            task.plugins {
-                create("grpc") {
-                    option("lite")
-                }
-                create("grpckt") {
-                    option("lite")
-                }
-            }
-        }
-    }
-}
-
 dependencies {
     api(projects.annotations)
+    api(projects.ai.sample.coreProto)
 
     implementation(libs.dagger.hiltandroid)
     implementation(projects.datalayer.core)

ai/sample/phone/build.gradle.kts

@@ -16,7 +16,6 @@
 
 plugins {
     id("com.android.application")
-    kotlin("android")
     id("com.google.devtools.ksp")
     id("dagger.hilt.android.plugin")
     kotlin("plugin.serialization")
@@ -61,16 +60,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.majorVersion
-
-        // Allow for widescale experimental APIs in Alpha libraries we build upon
-        freeCompilerArgs = freeCompilerArgs +
-            listOf(
-                "-opt-in=com.google.android.horologist.annotations.ExperimentalHorologistApi",
-            )
-    }
-
     packaging {
         resources {
             excludes +=

ai/sample/wear-core/build.gradle.kts

@@ -16,7 +16,6 @@
 
 plugins {
     id("com.android.library")
-    kotlin("android")
     id("com.google.devtools.ksp")
     id("dagger.hilt.android.plugin")
 }
@@ -39,14 +38,6 @@ android {
         buildConfig = false
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.majorVersion
-        freeCompilerArgs = freeCompilerArgs +
-            listOf(
-                "-opt-in=kotlin.RequiresOptIn",
-                "-opt-in=com.google.android.horologist.annotations.ExperimentalHorologistApi",
-            )
-    }
     packaging {
         resources {
             excludes +=

ai/sample/wear-gemini-lib/build.gradle.kts

@@ -34,7 +34,6 @@ import java.util.Properties
 
 plugins {
     id("com.android.library")
-    kotlin("android")
     id("org.jetbrains.kotlin.plugin.serialization")
 }
 
@@ -68,7 +67,13 @@ android {
         buildConfigField(
             "String",
             "GEMINI_PROXY",
-            if (localProperties.containsKey("gemini.apk.proxy")) "\"" + localProperties["gemini.apk.proxy"] + "\"" else "null",
+            if (localProperties.containsKey("gemini.apk.proxy")) {
+                "\"" +
+                    localProperties["gemini.apk.proxy"] +
+                    "\""
+            } else {
+                "null"
+            },
         )
     }
 
@@ -81,16 +86,6 @@ android {
         buildConfig = true
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.majorVersion
-
-        // Allow for widescale experimental APIs in Alpha libraries we build upon
-        freeCompilerArgs = freeCompilerArgs +
-            listOf(
-                "-opt-in=com.google.android.horologist.annotations.ExperimentalHorologistApi",
-            )
-    }
-
     testOptions {
         unitTests {
             isIncludeAndroidResources = true

ai/sample/wear-gemini/build.gradle.kts

@@ -34,7 +34,6 @@ import java.util.Properties
 
 plugins {
     id("com.android.application")
-    kotlin("android")
     id("com.google.devtools.ksp")
     id("dagger.hilt.android.plugin")
     id("org.jetbrains.kotlin.plugin.serialization")
@@ -87,16 +86,6 @@ android {
         buildConfig = true
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.majorVersion
-
-        // Allow for widescale experimental APIs in Alpha libraries we build upon
-        freeCompilerArgs = freeCompilerArgs +
-            listOf(
-                "-opt-in=com.google.android.horologist.annotations.ExperimentalHorologistApi",
-            )
-    }
-
     testOptions {
         unitTests {
             isIncludeAndroidResources = true

ai/sample/wear-prompt-app/build.gradle.kts

@@ -16,7 +16,6 @@
 
 plugins {
     id("com.android.application")
-    kotlin("android")
     id("com.google.devtools.ksp")
     id("dagger.hilt.android.plugin")
     kotlin("plugin.serialization")
@@ -64,16 +63,6 @@ android {
         buildConfig = true
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.majorVersion
-
-        // Allow for widescale experimental APIs in Alpha libraries we build upon
-        freeCompilerArgs = freeCompilerArgs +
-            listOf(
-                "-opt-in=com.google.android.horologist.annotations.ExperimentalHorologistApi",
-            )
-    }
-
     packaging {
         resources {
             excludes +=

ai/ui/build.gradle.kts

@@ -18,7 +18,6 @@ plugins {
     id("com.android.library")
     alias(libs.plugins.dokka)
     alias(libs.plugins.metalavaGradle)
-    kotlin("android")
     alias(libs.plugins.roborazzi)
     alias(libs.plugins.compose.compiler)
 }
@@ -41,12 +40,6 @@ android {
         buildConfig = false
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.majorVersion
-        freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"
-        freeCompilerArgs = freeCompilerArgs + "-opt-in=com.google.android.horologist.annotations.ExperimentalHorologistApi"
-    }
-
     packaging {
         resources {
             excludes +=
@@ -116,12 +109,4 @@ dependencies {
     testImplementation(libs.truth)
 }
 
-tasks.withType<org.jetbrains.dokka.gradle.DokkaTaskPartial>().configureEach {
-    dokkaSourceSets {
-        configureEach {
-            moduleName.set("ai-ui")
-        }
-    }
-}
-
 apply(plugin = "com.vanniktech.maven.publish")

auth/composables-material3/build.gradle.kts

@@ -19,7 +19,6 @@ plugins {
     alias(libs.plugins.dokka)
     alias(libs.plugins.metalavaGradle)
     alias(libs.plugins.dependencyAnalysis)
-    kotlin("android")
     alias(libs.plugins.roborazzi)
     alias(libs.plugins.compose.compiler)
 }
@@ -42,13 +41,6 @@ android {
         buildConfig = false
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.majorVersion
-        freeCompilerArgs += listOf(
-            "-opt-in=com.google.android.horologist.annotations.ExperimentalHorologistApi",
-        )
-    }
-
     packaging {
         resources {
             excludes +=
@@ -130,12 +122,4 @@ dependencyAnalysis {
     }
 }
 
-tasks.withType<org.jetbrains.dokka.gradle.DokkaTaskPartial>().configureEach {
-    dokkaSourceSets {
-        configureEach {
-            moduleName.set("auth-composables-material3")
-        }
-    }
-}
-
 apply(plugin = "com.vanniktech.maven.publish")

auth/composables-material3/src/main/java/com/google/android/horologist/auth/composables/material3/screens/SignedInConfirmationDialog.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2022-2026 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.AccountCircle
 import androidx.compose.material.icons.outlined.AccountCircle
-import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialShapes
 import androidx.compose.material3.toShape
@@ -135,7 +134,6 @@ public fun SignedInConfirmationDialog(
     )
 }
 
-@OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 internal fun SignedInConfirmationDialogContent(
     modifier: Modifier = Modifier,
@@ -197,7 +195,7 @@ internal fun SignedInConfirmationDialogContent(
                 text = if (hasName) {
                     stringResource(
                         id = R.string.horologist_signedin_confirmation_greeting,
-                        name!!,
+                        name,
                     )
                 } else {
                     stringResource(id = R.string.horologist_signedin_confirmation_greeting_no_name)