🤖 Update Dependencies (#353)

* 🤖 Update Dependencies

* Update gradle

* Update gradle

* Fix lint checks

* Migrate kapt to ksp

* Fix private injection

---------

Co-authored-by: Ben Trengrove <[email protected]>
Co-authored-by: Ben Trengrove <[email protected]>

Author: compose-devrel-github-bot

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.kotlin.android) apply false
-    alias(libs.plugins.kapt) apply false
+    alias(libs.plugins.ksp) apply false
     alias(libs.plugins.hilt) apply false
     alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.compose.compiler) apply false

compose/snippets/build.gradle.kts

@@ -17,7 +17,7 @@
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kapt)
+    alias(libs.plugins.ksp)
     alias(libs.plugins.hilt)
     alias(libs.plugins.kotlin.parcelize)
     alias(libs.plugins.compose.compiler)
@@ -146,7 +146,7 @@ dependencies {
     implementation(libs.hilt.android)
     implementation(libs.glide.compose)
 
-    kapt(libs.hilt.compiler)
+    ksp(libs.hilt.compiler)
 
     testImplementation(libs.junit)
 

compose/snippets/src/main/java/com/example/compose/snippets/interop/ComposeWithOtherLibraries.kt

@@ -162,7 +162,7 @@ private object StreamData {
     }
 }
 
-private object HiltExample3 {
+object HiltExample3 {
     // [START android_compose_libraries_hilt_3]
     @HiltViewModel
     class MyViewModel @Inject constructor(
@@ -180,7 +180,7 @@ private object HiltExample3 {
     interface ExampleRepository
 }
 
-private object HiltViewModel {
+object HiltViewModel {
     @HiltViewModel
     class MyViewModel @Inject constructor() : ViewModel() { /* ... */ }
     // [START android_compose_libraries_hilt_viewmodel]
@@ -207,7 +207,7 @@ private object HiltViewModel {
     }
 }
 
-private object HiltViewModelBackStack {
+object HiltViewModelBackStack {
     @HiltViewModel
     class MyViewModel @Inject constructor() : ViewModel() { /* ... */ }
 
@@ -273,7 +273,7 @@ private object MapsExample {
             cameraPositionState = cameraPositionState
         ) {
             Marker(
-                state = MarkerState(position = singapore),
+                state = remember { MarkerState(position = singapore) },
                 title = "Singapore",
                 snippet = "Marker in Singapore"
             )

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

@@ -180,18 +180,18 @@ fun rememberFirebaseAnalytics(user: User): FirebaseAnalytics {
 }
 // [END android_compose_side_effects_sideeffect]
 
+// b/368420773
+@Suppress("ProduceStateDoesNotAssignValue")
 // [START android_compose_side_effects_producestate]
 @Composable
 fun loadNetworkImage(
     url: String,
     imageRepository: ImageRepository = ImageRepository()
 ): State<Result<Image>> {
-
     // Creates a State<T> with Result.Loading as initial value
     // If either `url` or `imageRepository` changes, the running producer
     // will cancel and will be re-launched with the new inputs.
     return produceState<Result<Image>>(initialValue = Result.Loading, url, imageRepository) {
-
         // In a coroutine, can make suspend calls
         val image = imageRepository.load(url)
 

gradle/libs.versions.toml

@@ -1,9 +1,9 @@
 [versions]
-accompanist = "0.34.0"
-androidGradlePlugin = "8.4.2"
+accompanist = "0.36.0"
+androidGradlePlugin = "8.6.1"
 androidx-activity-compose = "1.9.2"
 androidx-appcompat = "1.7.0"
-androidx-compose-bom = "2024.09.00"
+androidx-compose-bom = "2024.09.02"
 androidx-compose-ui-test = "1.7.0-alpha08"
 androidx-constraintlayout = "2.1.4"
 androidx-constraintlayout-compose = "1.0.1"
@@ -12,45 +12,44 @@ androidx-corektx = "1.13.1"
 androidx-emoji2-views = "1.5.0"
 androidx-fragment-ktx = "1.8.3"
 androidx-glance-appwidget = "1.1.0"
-androidx-lifecycle-compose = "2.8.5"
-androidx-lifecycle-runtime-compose = "2.8.5"
-androidx-navigation = "2.8.0"
+androidx-lifecycle-compose = "2.8.6"
+androidx-lifecycle-runtime-compose = "2.8.6"
+androidx-navigation = "2.8.1"
 androidx-paging = "3.3.2"
 androidx-test = "1.6.1"
-androidx-test-espresso = "3.5.1"
+androidx-test-espresso = "3.6.1"
 androidx-window = "1.3.0"
 androidxHiltNavigationCompose = "1.2.0"
-coil = "2.6.0"
+coil = "2.7.0"
 # @keep
 compileSdk = "34"
+compose-latest = "1.7.2"
+composeUiTooling = "1.4.0"
 coreSplashscreen = "1.0.1"
-compose-latest = "1.7.0"
 coroutines = "1.7.3"
-google-maps = "18.2.0"
+glide = "1.0.0-beta01"
+google-maps = "19.0.0"
 gradle-versions = "0.51.0"
-hilt = "2.50"
-horologist = "0.5.24"
+hilt = "2.52"
+horologist = "0.6.19"
 junit = "4.13.2"
-kotlin = "2.0.0"
-kotlinxSerializationJson = "1.6.3"
-
-ksp = "1.8.0-1.0.9"
-maps-compose = "4.3.2"
-material = "1.4.0-beta01"
+kotlin = "2.0.20"
+kotlinxSerializationJson = "1.7.3"
+ksp = "2.0.20-1.0.25"
+maps-compose = "6.1.2"
+material = "1.13.0-alpha06"
 material3-adaptive = "1.0.0"
 material3-adaptive-navigation-suite = "1.3.0"
-media3 = "1.3.1"
+media3 = "1.4.1"
 # @keep
 minSdk = "21"
 playServicesWearable = "18.2.0"
 recyclerview = "1.3.2"
 # @keep
 targetSdk = "34"
-version-catalog-update = "0.8.3"
+version-catalog-update = "0.8.4"
 wearComposeFoundation = "1.4.0"
 wearComposeMaterial = "1.4.0"
-composeUiTooling = "1.4.0"
-glide= "1.0.0-beta01"
 
 [libraries]
 accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" }
@@ -60,7 +59,7 @@ accompanist-theme-adapter-material = { module = "com.google.accompanist:accompan
 accompanist-theme-adapter-material3 = { module = "com.google.accompanist:accompanist-themeadapter-material3", version.ref = "accompanist" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
-androidx-compose-animation-graphics = { module = "androidx.compose.animation:animation-graphics" , version.ref = "compose-latest" }
+androidx-compose-animation-graphics = { module = "androidx.compose.animation:animation-graphics", version.ref = "compose-latest" }
 androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" }
 androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose-latest" }
 androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "compose-latest" }
@@ -76,7 +75,6 @@ androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" }
 androidx-compose-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata" }
 androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose-latest" }
 androidx-compose-ui-googlefonts = { module = "androidx.compose.ui:ui-text-google-fonts" }
-androidx-graphics-shapes = "androidx.graphics:graphics-shapes:1.0.0-rc01"
 androidx-compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics" }
 androidx-compose-ui-test = { module = "androidx.compose.ui:ui-test" }
 androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
@@ -94,22 +92,28 @@ androidx-emoji2-views = { module = "androidx.emoji2:emoji2-views", version.ref =
 androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "androidx-fragment-ktx" }
 androidx-glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref = "androidx-glance-appwidget" }
 androidx-glance-material3 = { module = "androidx.glance:glance-material3", version.ref = "androidx-glance-appwidget" }
+androidx-graphics-shapes = "androidx.graphics:graphics-shapes:1.0.1"
 androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" }
-androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle-compose" }
+androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.5"
 androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle-runtime-compose" }
 androidx-lifecycle-viewModelCompose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle-compose" }
 androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" }
+androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core" }
+androidx-media3-common = { module = "androidx.media3:media3-common", version.ref = "media3" }
+androidx-media3-exoplayer = { module = "androidx.media3:media3-exoplayer", version.ref = "media3" }
 androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation" }
 androidx-paging-compose = { module = "androidx.paging:paging-compose", version.ref = "androidx-paging" }
 androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
 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-runner = "androidx.test:runner:1.5.2"
+androidx-test-runner = "androidx.test:runner:1.6.2"
 androidx-window-core = { module = "androidx.window:window-core", version.ref = "androidx-window" }
-androidx-work-runtime-ktx = "androidx.work:work-runtime-ktx:2.9.0"
+androidx-work-runtime-ktx = "androidx.work:work-runtime-ktx:2.9.1"
 coil-kt-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
 compose-foundation = { module = "androidx.wear.compose:compose-foundation", version.ref = "wearComposeFoundation" }
 compose-material = { module = "androidx.wear.compose:compose-material", version.ref = "wearComposeMaterial" }
+compose-ui-tooling = { module = "androidx.wear.compose:compose-ui-tooling", version.ref = "composeUiTooling" }
+glide-compose = { module = "com.github.bumptech.glide:compose", version.ref = "glide" }
 google-android-material = { module = "com.google.android.material:material", version.ref = "material" }
 googlemaps-compose = { module = "com.google.maps.android:maps-compose", version.ref = "maps-compose" }
 googlemaps-maps = { module = "com.google.android.gms:play-services-maps", version.ref = "google-maps" }
@@ -120,23 +124,18 @@ horologist-compose-material = { module = "com.google.android.horologist:horologi
 junit = { module = "junit:junit", version.ref = "junit" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
-kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
-kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
-androidx-media3-common = { group = "androidx.media3", name = "media3-common", version.ref = "media3" }
-androidx-media3-exoplayer = { group = "androidx.media3", name = "media3-exoplayer", version.ref = "media3" }
+kotlinx-coroutines-test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0"
+kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
 play-services-wearable = { module = "com.google.android.gms:play-services-wearable", version.ref = "playServicesWearable" }
-compose-ui-tooling = { group = "androidx.wear.compose", name = "compose-ui-tooling", version.ref = "composeUiTooling" }
-androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core" }
-glide-compose = { module = "com.github.bumptech.glide:compose" , version.ref = "glide"}
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
 android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
 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" }
-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 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" }
 version-catalog-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "version-catalog-update" }

gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,6 @@
-#Tue May 14 19:06:12 BST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail