Merge branch 'main' into nav3

Author: yrezgui

.github/workflows/apply_spotless.yml

@@ -30,13 +30,13 @@ jobs:
 
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         token: ${{ secrets.PAT || github.token }}
         fetch-depth: 0
 
     - name: set up Java 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: 'zulu'
         java-version: '17'

.github/workflows/build-ios.yml

@@ -39,7 +39,7 @@ jobs:
           xcode-version: latest-stable
 
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Build iOS app
         uses: mxcl/xcodebuild@v3

.github/workflows/build.yml

@@ -29,11 +29,11 @@ jobs:
     timeout-minutes: 30
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         token: ${{ secrets.PAT || github.token }}
     - name: set up Java 25
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: 'zulu'
         java-version: '25'

.github/workflows/sync_main_latest.yml

@@ -11,7 +11,7 @@ jobs:
     name: Syncing branches
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set git config user
         run: git config user.email "compose-devrel-github-bot@google.com" && git config user.name "compose-devrel-github-bot"
@@ -21,7 +21,7 @@ jobs:
 
       - name: Create pull request
         id: cpr
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v8
         with:
           token: ${{ secrets.PAT }}
           commit-message: 🤖 Sync main to latest

.github/workflows/update_deps.yml

@@ -7,9 +7,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: 17
           distribution: 'zulu'
@@ -19,7 +19,7 @@ jobs:
         run: ./gradlew versionCatalogUpdate
       - name: Create pull request
         id: cpr
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v8
         with:
           token: ${{ secrets.PAT }}
           commit-message: 🤖 Update Dependencies

compose/snippets/src/main/java/com/example/compose/snippets/sideeffects/SideEffectsSnippets.kt

@@ -43,6 +43,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
@@ -52,6 +53,9 @@ import com.example.compose.snippets.interop.FirebaseAnalytics
 import com.example.compose.snippets.interop.User
 import com.example.compose.snippets.kotlin.Message
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 
@@ -263,3 +267,54 @@ fun DerivedStateOfWrongUsage() {
     val fullNameCorrect = "$firstName $lastName" // This is correct
     // [END android_compose_side_effects_derivedstateof_wrong]
 }
+
+@Composable
+private fun SnapshotFlowExample() {
+    // [START android_compose_side_effects_snapshotflow]
+    val listState = rememberLazyListState()
+
+    LazyColumn(state = listState) {
+        // ...
+    }
+
+    LaunchedEffect(listState) {
+        snapshotFlow { listState.firstVisibleItemIndex }
+            .map { index -> index > 0 }
+            .distinctUntilChanged()
+            .filter { it == true }
+            .collect {
+                MyAnalyticsService.sendScrolledPastFirstItemEvent()
+            }
+    }
+    // [END android_compose_side_effects_snapshotflow]
+}
+
+private object MyAnalyticsService {
+    fun sendScrolledPastFirstItemEvent() {}
+}
+
+private object RestartingEffectsSnippet {
+    // [START android_compose_side_effects_restarting_effects]
+    @Composable
+    fun HomeScreen(
+        lifecycleOwner: LifecycleOwner = LocalLifecycleOwner.current,
+        onStart: () -> Unit, // Send the 'started' analytics event
+        onStop: () -> Unit // Send the 'stopped' analytics event
+    ) {
+        // These values never change in Composition
+        val currentOnStart by rememberUpdatedState(onStart)
+        val currentOnStop by rememberUpdatedState(onStop)
+
+        DisposableEffect(lifecycleOwner) {
+            val observer = LifecycleEventObserver { _, event ->
+                /* ... */
+            }
+
+            lifecycleOwner.lifecycle.addObserver(observer)
+            onDispose {
+                lifecycleOwner.lifecycle.removeObserver(observer)
+            }
+        }
+    }
+    // [END android_compose_side_effects_restarting_effects]
+}

datastore/build.gradle.kts

@@ -106,7 +106,7 @@ dependencies {
 // [START android_datastore_proto_task]
 protobuf {
     protoc {
-        artifact = "com.google.protobuf:protoc:4.32.1"
+        artifact = "com.google.protobuf:protoc:4.34.0"
     }
     generateProtoTasks {
         all().forEach { task ->

gradle/libs.versions.toml

@@ -1,18 +1,18 @@
 [versions]
 accompanist = "0.36.0"
-activityKtx = "1.12.4"
+activityKtx = "1.13.0"
 android-googleid = "1.2.0"
-androidGradlePlugin = "9.0.1"
-androidx-activity-compose = "1.12.4"
-androidx-appcompat = "1.7.0"
-androidx-appfunctions = "1.0.0-alpha07"
-androidx-compose-bom = "2026.02.01"
+androidGradlePlugin = "9.1.0"
+androidx-activity-compose = "1.13.0"
+androidx-appcompat = "1.7.1"
+androidx-appfunctions = "1.0.0-alpha08"
+androidx-compose-bom = "2026.03.00"
 androidx-compose-ui-test = "1.7.0-alpha08"
-androidx-compose-ui-test-junit4-accessibility = "1.11.0-alpha06"
+androidx-compose-ui-test-junit4-accessibility = "1.11.0-beta01"
 androidx-constraintlayout = "2.2.1"
 androidx-constraintlayout-compose = "1.1.1"
 androidx-coordinator-layout = "1.3.0"
-androidx-corektx = "1.17.0"
+androidx-corektx = "1.18.0"
 androidx-credentials = "1.6.0-rc02"
 androidx-credentials-play-services-auth = "1.6.0-rc02"
 androidx-emoji2-views = "1.6.0"
@@ -23,7 +23,7 @@ androidx-lifecycle-runtime-compose = "2.10.0"
 androidx-lifecycle-viewmodel-navigation3 = "2.10.0-beta01"
 androidx-navigation = "2.9.7"
 androidx-navigation3 = "1.1.0-beta01"
-androidx-paging = "3.4.1"
+androidx-paging = "3.4.2"
 androidx-startup-runtime = "1.2.0"
 androidx-test = "1.7.0"
 androidx-test-espresso = "3.7.0"
@@ -35,25 +35,25 @@ androidx-work-runtime = "2.11.1"
 androidx-xr-arcore = "1.0.0-alpha11"
 androidx-xr-arcore-play-services = "1.0.0-alpha11"
 androidx-xr-compose = "1.0.0-alpha11"
-androidx-xr-glimmer = "1.0.0-alpha07"
+androidx-xr-glimmer = "1.0.0-alpha08"
 androidx-xr-projected = "1.0.0-alpha05"
 androidx-xr-scenecore = "1.0.0-alpha12"
 androidxHiltNavigationCompose = "1.3.0"
 appcompat = "1.7.1"
 coil = "2.7.0"
 # @keep
 compileSdk = "36"
-compose-latest = "1.10.4"
+compose-latest = "1.10.5"
 composeUiTooling = "1.5.6"
 coreSplashscreen = "1.2.0"
 coroutines = "1.10.2"
-dataStore = "1.2.0"
-datastoreCore = "1.2.0"
-datastorePreferencesRxjava2 = "1.2.0"
-datastorePreferencesRxjava3 = "1.2.0"
+dataStore = "1.2.1"
+datastoreCore = "1.2.1"
+datastorePreferencesRxjava2 = "1.2.1"
+datastorePreferencesRxjava3 = "1.2.1"
 firebase-bom = "34.10.0"
 glide = "1.0.0-beta08"
-google-ar-core = "1.52.0"
+google-ar-core = "1.53.0"
 google-maps = "20.0.0"
 gradle-versions = "0.53.0"
 guava = "33.5.0-jre"
@@ -68,8 +68,8 @@ kotlinxSerialization = "1.10.0"
 ksp = "2.3.6"
 ktlint = "1.5.0"
 lifecycleService = "2.10.0"
-maps-compose = "8.2.0"
-material = "1.14.0-alpha09"
+maps-compose = "8.2.1"
+material = "1.14.0-alpha10"
 material3-adaptive = "1.2.0"
 material3-adaptive-navigation-suite = "1.4.0"
 material3-adaptive-navigation3 = "1.3.0-alpha09"
@@ -88,11 +88,11 @@ recyclerview = "1.4.0"
 registryDigitalCredentials = "1.0.0-alpha04"
 robolectric = "4.16.1"
 roborazzi = "1.59.0"
-spotless = "8.2.1"
+spotless = "8.3.0"
 targetSdk = "36"
 tiles = "1.5.0"
 tracing = "1.3.0"
-tvComposeMaterial3 = "1.1.0-alpha01"
+tvComposeMaterial3 = "1.1.0-beta01"
 validatorPush = "1.0.0-alpha09"
 version-catalog-update = "1.1.0"
 watchfaceComplicationsDataSourceKtx = "1.3.0"
@@ -106,7 +106,7 @@ wearPhoneInteractions = "1.1.0"
 wearRemoteInteractions = "1.2.0"
 wearToolingPreview = "1.0.0"
 webkit = "1.15.0"
-wfp = "1.0.0-beta01"
+wfp = "1.0.0-rc01"
 
 [libraries]
 accompanist-adaptive = "com.google.accompanist:accompanist-adaptive:0.37.3"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

misc/src/main/java/com/example/snippets/ai/AppFunctionsApiSnippets.kt

@@ -33,7 +33,7 @@ class NoteFunctions(
      *
      * @param appFunctionContext The context in which the AppFunction is executed.
      */
-    @AppFunction(isDescribedByKdoc = true)
+    @AppFunction(isDescribedByKDoc = true)
     suspend fun listNotes(appFunctionContext: AppFunctionContext): List<Note>? {
         return noteRepository.appNotes.ifEmpty { null }?.toList()
     }
@@ -45,7 +45,7 @@ class NoteFunctions(
      * @param title The title of the note.
      * @param content The note's content.
      */
-    @AppFunction(isDescribedByKdoc = true)
+    @AppFunction(isDescribedByKDoc = true)
     suspend fun createNote(
         appFunctionContext: AppFunctionContext,
         title: String,
@@ -62,7 +62,7 @@ class NoteFunctions(
      * @param title The note's title if it should be updated.
      * @param content The new content if it should be updated.
      */
-    @AppFunction(isDescribedByKdoc = true)
+    @AppFunction(isDescribedByKDoc = true)
     suspend fun editNote(
         appFunctionContext: AppFunctionContext,
         noteId: Int,
@@ -76,7 +76,7 @@ class NoteFunctions(
 /**
  * A note.
  */
-@AppFunctionSerializable(isDescribedByKdoc = true)
+@AppFunctionSerializable(isDescribedByKDoc = true)
 data class Note(
     /** The note's identifier */
     val id: Int,