diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/touchinput/keyboardinput/KeyboardShortcutsHelper.kt b/compose/snippets/src/main/java/com/example/compose/snippets/touchinput/keyboardinput/KeyboardShortcutsHelper.kt index a7f21362f..610143cec 100644 --- a/compose/snippets/src/main/java/com/example/compose/snippets/touchinput/keyboardinput/KeyboardShortcutsHelper.kt +++ b/compose/snippets/src/main/java/com/example/compose/snippets/touchinput/keyboardinput/KeyboardShortcutsHelper.kt @@ -16,7 +16,6 @@ package com.example.compose.snippets.touchinput.keyboardinput -import android.app.Activity import android.os.Build import android.os.Bundle import android.view.KeyEvent @@ -24,13 +23,13 @@ import android.view.KeyboardShortcutGroup import android.view.KeyboardShortcutInfo import android.view.Menu import androidx.activity.ComponentActivity +import androidx.activity.compose.LocalActivity import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge import androidx.annotation.RequiresApi import androidx.compose.material3.Button import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.ui.platform.LocalContext class MainActivity : ComponentActivity() { // Activity codes such as overridden onStart method. @@ -66,7 +65,7 @@ class AnotherActivity : ComponentActivity() { setContent { MaterialTheme { // [START android_compose_keyboard_shortcuts_helper_request] - val activity = LocalContext.current as? Activity + val activity = LocalActivity.current Button( onClick = { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aaa8af84a..60263d02e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,9 +1,9 @@ [versions] accompanist = "0.36.0" -androidGradlePlugin = "8.7.3" -androidx-activity-compose = "1.9.3" +androidGradlePlugin = "8.8.0" +androidx-activity-compose = "1.10.0" androidx-appcompat = "1.7.0" -androidx-compose-bom = "2024.12.01" +androidx-compose-bom = "2025.01.00" androidx-compose-ui-test = "1.7.0-alpha08" androidx-constraintlayout = "2.2.0" androidx-constraintlayout-compose = "1.1.0" @@ -18,7 +18,7 @@ androidx-navigation = "2.8.5" androidx-paging = "3.3.5" androidx-test = "1.6.1" androidx-test-espresso = "3.6.1" -androidx-window = "1.4.0-alpha05" +androidx-window = "1.4.0-beta01" androidxHiltNavigationCompose = "1.2.0" coil = "2.7.0" # @keep @@ -26,36 +26,36 @@ compileSdk = "35" compose-latest = "1.7.6" composeUiTooling = "1.4.0" coreSplashscreen = "1.0.1" -coroutines = "1.9.0" +coroutines = "1.10.1" glide = "1.0.0-beta01" google-maps = "19.0.0" gradle-versions = "0.51.0" guava = "33.4.0-jre" -hilt = "2.53.1" +hilt = "2.55" horologist = "0.6.22" junit = "4.13.2" kotlin = "2.1.0" -kotlinxSerializationJson = "1.7.3" +kotlinxSerializationJson = "1.8.0" ksp = "2.1.0-1.0.29" -maps-compose = "6.4.0" -material = "1.13.0-alpha08" +maps-compose = "6.4.1" +material = "1.13.0-alpha09" material3-adaptive = "1.0.0" material3-adaptive-navigation-suite = "1.3.1" -media3 = "1.5.0" +media3 = "1.5.1" # @keep minSdk = "21" playServicesWearable = "19.0.0" -protolayout = "1.3.0-alpha05" -protolayoutExpression = "1.3.0-alpha05" -protolayoutMaterial = "1.3.0-alpha05" -recyclerview = "1.3.2" +protolayout = "1.3.0-alpha06" +protolayoutExpression = "1.3.0-alpha06" +protolayoutMaterial = "1.3.0-alpha06" +recyclerview = "1.4.0" # @keep targetSdk = "34" -tiles = "1.5.0-alpha05" -tilesRenderer = "1.5.0-alpha05" -tilesTesting = "1.5.0-alpha05" -tilesTooling = "1.5.0-alpha05" -tilesToolingPreview = "1.5.0-alpha05" +tiles = "1.5.0-alpha06" +tilesRenderer = "1.5.0-alpha06" +tilesTesting = "1.5.0-alpha06" +tilesTooling = "1.5.0-alpha06" +tilesToolingPreview = "1.5.0-alpha06" version-catalog-update = "0.8.5" wear = "1.3.0" wearComposeFoundation = "1.4.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0aaefbcaf..df97d72b8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME