Merge branch 'main' into cartland/refactor-modifier-param-order

Author: cartland

.github/workflows/apply_spotless.yml

@@ -42,16 +42,7 @@ jobs:
         java-version: '17'
 
     - name: Run spotlessApply
-      run: ./gradlew :compose:spotlessApply --init-script gradle/init.gradle.kts --no-configuration-cache --stacktrace
-
-    - name: Run spotlessApply for Wear
-      run: ./gradlew :wear:spotlessApply --init-script gradle/init.gradle.kts --no-configuration-cache --stacktrace
-
-    - name: Run spotlessApply for Misc
-      run: ./gradlew :misc:spotlessApply --init-script gradle/init.gradle.kts --no-configuration-cache --stacktrace
-
-    - name: Run spotlessApply for XR
-      run: ./gradlew :xr:spotlessApply --init-script gradle/init.gradle.kts --no-configuration-cache --stacktrace
+      run: ./gradlew spotlessApply --init-script gradle/init.gradle.kts --no-configuration-cache --stacktrace
 
     - name: Auto-commit if spotlessApply has changes
       uses: stefanzweifel/git-auto-commit-action@v5

.gitignore

@@ -6,7 +6,7 @@
 /.idea/modules.xml
 /.idea/workspace.xml
 .DS_Store
-/build
+build
 /captures
 .externalNativeBuild
 .idea/*

compose/snippets/src/main/java/com/example/compose/snippets/touchinput/focus/FocusSnippets.kt

@@ -297,7 +297,7 @@ private fun RequestFocus2() {
 private fun Capture() {
     var text by remember { mutableStateOf("") }
     // [START android_compose_touchinput_focus_capture]
-    val textField = FocusRequester()
+    val textField = remember { FocusRequester() }
 
     TextField(
         value = text,

gradle.properties

@@ -11,7 +11,7 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Mon May 22 14:59:56 BST 2023
-org.gradle.jvmargs=-Xmx2048m
+org.gradle.jvmargs=-Xmx4g
 
 # Turn on parallel compilation, caching and on-demand configuration
 org.gradle.configureondemand=true

gradle/libs.versions.toml

@@ -2,77 +2,78 @@
 accompanist = "0.36.0"
 activityKtx = "1.10.1"
 android-googleid = "1.1.1"
-androidGradlePlugin = "8.10.1"
+androidGradlePlugin = "8.12.1"
 androidx-activity-compose = "1.10.1"
 androidx-appcompat = "1.7.0"
-androidx-compose-bom = "2025.06.01"
+androidx-compose-bom = "2025.08.00"
 androidx-compose-ui-test = "1.7.0-alpha08"
-androidx-compose-ui-test-junit4-accessibility = "1.9.0-beta01"
+androidx-compose-ui-test-junit4-accessibility = "1.10.0-alpha01"
 androidx-constraintlayout = "2.2.1"
 androidx-constraintlayout-compose = "1.1.1"
 androidx-coordinator-layout = "1.3.0"
-androidx-corektx = "1.16.0"
+androidx-corektx = "1.17.0"
 androidx-credentials = "1.5.0"
 androidx-credentials-play-services-auth = "1.5.0"
 androidx-emoji2-views = "1.5.0"
-androidx-fragment-ktx = "1.8.8"
+androidx-fragment-ktx = "1.8.9"
 androidx-glance-appwidget = "1.1.1"
-androidx-lifecycle-compose = "2.9.1"
-androidx-lifecycle-runtime-compose = "2.9.1"
-androidx-navigation = "2.9.0"
+androidx-lifecycle-compose = "2.9.2"
+androidx-lifecycle-runtime-compose = "2.9.2"
+androidx-navigation = "2.9.3"
 androidx-paging = "3.3.6"
 androidx-startup-runtime = "1.2.0"
-androidx-test = "1.6.1"
-androidx-test-espresso = "3.6.1"
-androidx-test-junit = "1.2.1"
-androidx-window = "1.5.0-alpha02"
-androidx-window-core = "1.5.0-alpha02"
-androidx-window-java = "1.5.0-alpha02"
+androidx-test = "1.7.0"
+androidx-test-espresso = "3.7.0"
+androidx-test-junit = "1.3.0"
+androidx-window = "1.5.0-beta02"
+androidx-window-core = "1.5.0-beta02"
+androidx-window-java = "1.5.0-beta02"
 androidx-xr-arcore = "1.0.0-alpha05"
-androidx-xr-scenecore = "1.0.0-alpha05"
-androidx-xr-compose = "1.0.0-alpha05"
+androidx-xr-compose = "1.0.0-alpha06"
+androidx-xr-scenecore = "1.0.0-alpha06"
 androidxHiltNavigationCompose = "1.2.0"
 appcompat = "1.7.1"
 coil = "2.7.0"
 # @keep
-compileSdk = "35"
-compose-latest = "1.8.3"
+compileSdk = "36"
+compose-latest = "1.9.0"
 composeUiTooling = "1.4.1"
 coreSplashscreen = "1.0.1"
 coroutines = "1.10.2"
 glide = "1.0.0-beta01"
 google-maps = "19.2.0"
 gradle-versions = "0.52.0"
 guava = "33.4.8-jre"
-hilt = "2.56.2"
-horologist = "0.7.14-beta"
+hilt = "2.57"
+horologist = "0.8.1-alpha"
 junit = "4.13.2"
-kotlin = "2.2.0"
+kotlin = "2.2.10"
 kotlinCoroutinesOkhttp = "1.0"
 kotlinxCoroutinesGuava = "1.10.2"
-kotlinxSerializationJson = "1.8.1"
-ksp = "2.1.21-2.0.2"
-lifecycleService = "2.9.1"
-maps-compose = "6.6.0"
-material = "1.14.0-alpha02"
+kotlinxSerializationJson = "1.9.0"
+ksp = "2.2.10-2.0.2"
+lifecycleService = "2.9.2"
+maps-compose = "6.7.2"
+material = "1.14.0-alpha03"
 material3-adaptive = "1.1.0"
 material3-adaptive-navigation-suite = "1.3.2"
 media3 = "1.8.0"
 # @keep
 minSdk = "35"
-okHttp = "4.12.0"
+okHttp = "5.1.0"
 playServicesWearable = "19.0.0"
 protolayout = "1.3.0"
 recyclerview = "1.4.0"
 targetSdk = "35"
 tiles = "1.5.0"
 tracing = "1.3.0"
-validatorPush = "1.0.0-alpha03"
+validatorPush = "1.0.0-alpha06"
 version-catalog-update = "1.0.0"
+watchfaceComplicationsDataSourceKtx = "1.2.1"
 wear = "1.3.0"
-wearComposeFoundation = "1.5.0-beta04"
-wearComposeMaterial = "1.5.0-beta04"
-wearComposeMaterial3 = "1.5.0-beta04"
+wearComposeFoundation = "1.5.0-rc02"
+wearComposeMaterial = "1.5.0-rc02"
+wearComposeMaterial3 = "1.5.0-rc02"
 wearOngoing = "1.0.0"
 wearToolingPreview = "1.0.0"
 webkit = "1.14.0"
@@ -144,21 +145,22 @@ androidx-startup-runtime = { module = "androidx.startup:startup-runtime", versio
 androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test" }
 androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-test-espresso" }
 androidx-test-ext-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-junit" }
-androidx-test-runner = "androidx.test:runner:1.6.2"
+androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test" }
 androidx-tiles = { module = "androidx.wear.tiles:tiles", version.ref = "tiles" }
 androidx-tiles-renderer = { module = "androidx.wear.tiles:tiles-renderer", version.ref = "tiles" }
 androidx-tiles-testing = { module = "androidx.wear.tiles:tiles-testing", version.ref = "tiles" }
 androidx-tiles-tooling = { module = "androidx.wear.tiles:tiles-tooling", version.ref = "tiles" }
 androidx-tiles-tooling-preview = { module = "androidx.wear.tiles:tiles-tooling-preview", version.ref = "tiles" }
-androidx-tracing = { group = "androidx.tracing", name = "tracing", version.ref = "tracing" }
+androidx-tracing = { module = "androidx.tracing:tracing", version.ref = "tracing" }
+androidx-watchface-complications-data-source-ktx = { module = "androidx.wear.watchface:watchface-complications-data-source-ktx", version.ref = "watchfaceComplicationsDataSourceKtx" }
 androidx-wear = { module = "androidx.wear:wear", version.ref = "wear" }
 androidx-wear-ongoing = { module = "androidx.wear:wear-ongoing", version.ref = "wearOngoing" }
 androidx-wear-tooling-preview = { module = "androidx.wear:wear-tooling-preview", version.ref = "wearToolingPreview" }
 androidx-webkit = { module = "androidx.webkit:webkit", version.ref = "webkit" }
 androidx-window = { module = "androidx.window:window", version.ref = "androidx-window" }
 androidx-window-core = { module = "androidx.window:window-core", version.ref = "androidx-window-core" }
 androidx-window-java = { module = "androidx.window:window-java", version.ref = "androidx-window-java" }
-androidx-work-runtime-ktx = "androidx.work:work-runtime-ktx:2.10.2"
+androidx-work-runtime-ktx = "androidx.work:work-runtime-ktx:2.10.3"
 androidx-xr-arcore = { module = "androidx.xr.arcore:arcore", version.ref = "androidx-xr-arcore" }
 androidx-xr-compose = { module = "androidx.xr.compose:compose", version.ref = "androidx-xr-compose" }
 androidx-xr-scenecore = { module = "androidx.xr.scenecore:scenecore", version.ref = "androidx-xr-scenecore" }
@@ -194,7 +196,7 @@ android-library = { id = "com.android.library", version.ref = "androidGradlePlug
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 gradle-versions = { id = "com.github.ben-manes.versions", version.ref = "gradle-versions" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
-kotlin-android = "org.jetbrains.kotlin.android:2.2.0"
+kotlin-android = "org.jetbrains.kotlin.android:2.2.10"
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }

identity/credentialmanager/build.gradle.kts

@@ -39,6 +39,13 @@ android {
     buildFeatures {
         compose = true
     }
+    sourceSets {
+        named("main") {
+            java {
+                srcDir("src/main/java")
+            }
+        }
+    }
 }
 
 dependencies {

identity/credentialmanager/src/main/java/com/example/identity/credentialmanager/CredentialManagerHandler.kt

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2025 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.
+ */
+
 package com.example.identity.credentialmanager
 
 import android.app.Activity
@@ -13,39 +29,39 @@ import androidx.credentials.exceptions.GetCredentialException
 
 // This class is mostly copied from https://github.com/android/identity-samples/blob/main/WebView/CredentialManagerWebView/CredentialManagerHandler.kt.
 class CredentialManagerHandler(private val activity: Activity) {
-  private val mCredMan = CredentialManager.create(activity.applicationContext)
-  private val TAG = "CredentialManagerHandler"
-  /**
-   * Encapsulates the create passkey API for credential manager in a less error-prone manner.
-   *
-   * @param request a create public key credential request JSON required by [CreatePublicKeyCredentialRequest].
-   * @return [CreatePublicKeyCredentialResponse] containing the result of the credential creation.
-   */
-  suspend fun createPasskey(request: String): CreatePublicKeyCredentialResponse {
-    val createRequest = CreatePublicKeyCredentialRequest(request)
-    try {
-      return mCredMan.createCredential(activity, createRequest) as CreatePublicKeyCredentialResponse
-    } catch (e: CreateCredentialException) {
-      // For error handling use guidance from https://developer.android.com/training/sign-in/passkeys
-      Log.i(TAG, "Error creating credential: ErrMessage: ${e.errorMessage}, ErrType: ${e.type}")
-      throw e
+    private val mCredMan = CredentialManager.create(activity.applicationContext)
+    private val TAG = "CredentialManagerHandler"
+    /**
+     * Encapsulates the create passkey API for credential manager in a less error-prone manner.
+     *
+     * @param request a create public key credential request JSON required by [CreatePublicKeyCredentialRequest].
+     * @return [CreatePublicKeyCredentialResponse] containing the result of the credential creation.
+     */
+    suspend fun createPasskey(request: String): CreatePublicKeyCredentialResponse {
+        val createRequest = CreatePublicKeyCredentialRequest(request)
+        try {
+            return mCredMan.createCredential(activity, createRequest) as CreatePublicKeyCredentialResponse
+        } catch (e: CreateCredentialException) {
+            // For error handling use guidance from https://developer.android.com/training/sign-in/passkeys
+            Log.i(TAG, "Error creating credential: ErrMessage: ${e.errorMessage}, ErrType: ${e.type}")
+            throw e
+        }
     }
-  }
 
-  /**
-   * Encapsulates the get passkey API for credential manager in a less error-prone manner.
-   *
-   * @param request a get public key credential request JSON required by [GetCredentialRequest].
-   * @return [GetCredentialResponse] containing the result of the credential retrieval.
-   */
-  suspend fun getPasskey(request: String): GetCredentialResponse {
-    val getRequest = GetCredentialRequest(listOf(GetPublicKeyCredentialOption(request, null)))
-    try {
-      return mCredMan.getCredential(activity, getRequest)
-    } catch (e: GetCredentialException) {
-      // For error handling use guidance from https://developer.android.com/training/sign-in/passkeys
-      Log.i(TAG, "Error retrieving credential: ${e.message}")
-      throw e
+    /**
+     * Encapsulates the get passkey API for credential manager in a less error-prone manner.
+     *
+     * @param request a get public key credential request JSON required by [GetCredentialRequest].
+     * @return [GetCredentialResponse] containing the result of the credential retrieval.
+     */
+    suspend fun getPasskey(request: String): GetCredentialResponse {
+        val getRequest = GetCredentialRequest(listOf(GetPublicKeyCredentialOption(request, null)))
+        try {
+            return mCredMan.getCredential(activity, getRequest)
+        } catch (e: GetCredentialException) {
+            // For error handling use guidance from https://developer.android.com/training/sign-in/passkeys
+            Log.i(TAG, "Error retrieving credential: ${e.message}")
+            throw e
+        }
     }
-  }
 }