Update all dependencies (#2180)

* Update all dependencies * Update libs.versions.toml * Fixes * Fixes --------- Co-authored-by: Mend Renovate <[email protected]>
google · Apr 8, 2024 · e201d84 · e201d84
1 parent 9bac126
commit e201d84
Show file tree

Hide file tree

Showing 10 changed files with 76 additions and 69 deletions.
diff --git a/ai/sample/core/build.gradle.kts b/ai/sample/core/build.gradle.kts
@@ -81,7 +81,7 @@ protobuf {
             artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
         }
         create("grpc") {
-            artifact = "io.grpc:protoc-gen-grpc-java:1.62.2"
+            artifact = "io.grpc:protoc-gen-grpc-java:1.63.0"
         }
         create("grpckt") {
             artifact = "io.grpc:protoc-gen-grpc-kotlin:1.3.0:jdk8@jar"

diff --git a/auth/sample/shared/build.gradle.kts b/auth/sample/shared/build.gradle.kts
@@ -81,7 +81,7 @@ protobuf {
             artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
         }
         create("grpc") {
-            artifact = "io.grpc:protoc-gen-grpc-java:1.62.2"
+            artifact = "io.grpc:protoc-gen-grpc-java:1.63.0"
         }
         create("grpckt") {
             artifact = "io.grpc:protoc-gen-grpc-kotlin:1.3.0:jdk8@jar"

diff --git a/composables/src/main/java/com/google/android/horologist/composables/TimePicker.kt b/composables/src/main/java/com/google/android/horologist/composables/TimePicker.kt
@@ -59,7 +59,6 @@ import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalInspectionMode
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.clearAndSetSemantics
@@ -72,6 +71,7 @@ import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.wear.compose.foundation.ExperimentalWearFoundationApi
 import androidx.wear.compose.material.Button
 import androidx.wear.compose.material.Icon
@@ -131,8 +131,7 @@ public fun TimePicker(
     )
 
     val touchExplorationStateProvider = remember { DefaultTouchExplorationStateProvider() }
-    val touchExplorationServicesEnabled by touchExplorationStateProvider
-        .touchExplorationState()
+    val touchExplorationServicesEnabled by touchExplorationStateProvider.touchExplorationState()
 
     // When the time picker loads, none of the individual pickers are selected in talkback mode,
     // otherwise hours picker should be focused.
@@ -236,14 +235,18 @@ public fun TimePicker(
             Spacer(Modifier.height(4.dp))
             Row(
                 // Horizontal padding is 2.08% + 5.2%
-                modifier = Modifier.fillMaxWidth(1 - 2 * 0.0728f).weight(1f),
+                modifier = Modifier
+                    .fillMaxWidth(1 - 2 * 0.0728f)
+                    .weight(1f),
                 verticalAlignment = Alignment.CenterVertically,
                 horizontalArrangement = Arrangement.Center,
             ) {
                 val pickerGroupItems = mutableListOf(
                     pickerGroupItemWithRSB(
                         pickerState = hourState,
-                        modifier = Modifier.width(pickerWidth).fillMaxHeight(),
+                        modifier = Modifier
+                            .width(pickerWidth)
+                            .fillMaxHeight(),
                         onSelected = {
                             onPickerSelected(
                                 FocusableElementsTimePicker.HOURS,
@@ -255,7 +258,9 @@ public fun TimePicker(
                     ),
                     pickerGroupItemWithRSB(
                         pickerState = minuteState,
-                        modifier = Modifier.width(pickerWidth).fillMaxHeight(),
+                        modifier = Modifier
+                            .width(pickerWidth)
+                            .fillMaxHeight(),
                         onSelected = {
                             onPickerSelected(
                                 FocusableElementsTimePicker.MINUTES,
@@ -274,7 +279,9 @@ public fun TimePicker(
                     pickerGroupItems.add(
                         pickerGroupItemWithRSB(
                             pickerState = secondState,
-                            modifier = Modifier.width(pickerWidth).fillMaxHeight(),
+                            modifier = Modifier
+                                .width(pickerWidth)
+                                .fillMaxHeight(),
                             onSelected = {
                                 onPickerSelected(
                                     FocusableElementsTimePicker.SECONDS,
@@ -309,8 +316,8 @@ public fun TimePicker(
                 },
                 modifier = Modifier
                     .semantics {
-                        focused = pickerGroupState.selectedIndex ==
-                            FocusableElementsTimePicker.CONFIRM_BUTTON.index
+                        focused =
+                            pickerGroupState.selectedIndex == FocusableElementsTimePicker.CONFIRM_BUTTON.index
                     }
                     .focusRequester(focusRequesterConfirmButton)
                     .focusable(),
@@ -371,29 +378,26 @@ public fun TimePickerWith12HourClock(
 
     val touchExplorationStateProvider = remember { DefaultTouchExplorationStateProvider() }
 
-    val touchExplorationServicesEnabled by touchExplorationStateProvider
-        .touchExplorationState()
+    val touchExplorationServicesEnabled by touchExplorationStateProvider.touchExplorationState()
 
     // When the time picker loads, none of the individual pickers are selected in talkback mode,
     // otherwise hours picker should be focused.
-    val pickerGroupState =
-        if (touchExplorationServicesEnabled) {
-            rememberPickerGroupState(FocusableElement12Hour.NONE.index)
-        } else {
-            rememberPickerGroupState(FocusableElement12Hour.HOURS.index)
-        }
+    val pickerGroupState = if (touchExplorationServicesEnabled) {
+        rememberPickerGroupState(FocusableElement12Hour.NONE.index)
+    } else {
+        rememberPickerGroupState(FocusableElement12Hour.HOURS.index)
+    }
 
     val isLargeScreen = LocalConfiguration.current.screenWidthDp > 225
-    val textStyle =
-        with(LocalDensity.current) {
-            fontScaleIndependent(
-                if (isLargeScreen) {
-                    MaterialTheme.typography.display2
-                } else {
-                    MaterialTheme.typography.display3
-                },
-            )
-        }
+    val textStyle = with(LocalDensity.current) {
+        fontScaleIndependent(
+            if (isLargeScreen) {
+                MaterialTheme.typography.display2
+            } else {
+                MaterialTheme.typography.display3
+            },
+        )
+    }
 
     val focusRequesterConfirmButton = remember { FocusRequester() }
 
@@ -444,8 +448,11 @@ public fun TimePickerWith12HourClock(
             density = density,
         )
 
-        (0..9).maxOf { mm.getBoundingBox(it).width } to
-            (1..2).maxOf { mm.getLineRight(it) - mm.getLineLeft(it) }
+        (0..9).maxOf { mm.getBoundingBox(it).width } to (1..2).maxOf {
+            mm.getLineRight(it) - mm.getLineLeft(
+                it,
+            )
+        }
     }
     val pickerWidth = with(LocalDensity.current) { (digitWidth * 2).toDp() + 6.dp }
     val pickerWidth2 = with(LocalDensity.current) { amPmWidth.toDp() + 6.dp }
@@ -474,7 +481,9 @@ public fun TimePickerWith12HourClock(
             )
             Spacer(Modifier.height(4.dp))
             Row(
-                modifier = Modifier.fillMaxWidth(1 - 2 * 0.0728f).weight(1f),
+                modifier = Modifier
+                    .fillMaxWidth(1 - 2 * 0.0728f)
+                    .weight(1f),
                 verticalAlignment = Alignment.CenterVertically,
                 horizontalArrangement = Arrangement.Center,
             ) {
@@ -493,7 +502,9 @@ public fun TimePickerWith12HourClock(
                 PickerGroup(
                     pickerGroupItemWithRSB(
                         pickerState = hourState,
-                        modifier = Modifier.width(pickerWidth).fillMaxHeight(),
+                        modifier = Modifier
+                            .width(pickerWidth)
+                            .fillMaxHeight(),
                         onSelected = {
                             doubleTapToNext(
                                 FocusableElement12Hour.HOURS,
@@ -505,7 +516,9 @@ public fun TimePickerWith12HourClock(
                     ),
                     pickerGroupItemWithRSB(
                         pickerState = minuteState,
-                        modifier = Modifier.width(pickerWidth).fillMaxHeight(),
+                        modifier = Modifier
+                            .width(pickerWidth)
+                            .fillMaxHeight(),
                         onSelected = {
                             doubleTapToNext(
                                 FocusableElement12Hour.MINUTES,
@@ -517,7 +530,9 @@ public fun TimePickerWith12HourClock(
                     ),
                     pickerGroupItemWithRSB(
                         pickerState = periodState,
-                        modifier = Modifier.width(pickerWidth2).fillMaxHeight(),
+                        modifier = Modifier
+                            .width(pickerWidth2)
+                            .fillMaxHeight(),
                         contentDescription = periodContentDescription,
                         onSelected = {
                             doubleTapToNext(
@@ -551,8 +566,8 @@ public fun TimePickerWith12HourClock(
                 },
                 modifier = Modifier
                     .semantics {
-                        focused = pickerGroupState.selectedIndex ==
-                            FocusableElement12Hour.CONFIRM_BUTTON.index
+                        focused =
+                            pickerGroupState.selectedIndex == FocusableElement12Hour.CONFIRM_BUTTON.index
                     }
                     .focusRequester(focusRequesterConfirmButton)
                     .focusable(),
@@ -743,12 +758,7 @@ private fun createDescription12Hour(
 }
 
 private enum class FocusableElementsTimePicker(val index: Int) {
-    HOURS(0),
-    MINUTES(1),
-    SECONDS(2),
-    CONFIRM_BUTTON(3),
-    NONE(-1),
-    ;
+    HOURS(0), MINUTES(1), SECONDS(2), CONFIRM_BUTTON(3), NONE(-1), ;
 
     companion object {
         private val map = entries.associateBy { it.index }
@@ -757,12 +767,7 @@ private enum class FocusableElementsTimePicker(val index: Int) {
 }
 
 private enum class FocusableElement12Hour(val index: Int) {
-    HOURS(0),
-    MINUTES(1),
-    PERIOD(2),
-    CONFIRM_BUTTON(3),
-    NONE(-1),
-    ;
+    HOURS(0), MINUTES(1), PERIOD(2), CONFIRM_BUTTON(3), NONE(-1), ;
 
     companion object {
         private val map = entries.associateBy { it.index }

diff --git a/compose-layout/src/main/java/com/google/android/horologist/compose/ambient/AmbientAware.kt b/compose-layout/src/main/java/com/google/android/horologist/compose/ambient/AmbientAware.kt
@@ -26,7 +26,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalLifecycleOwner
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.wear.ambient.AmbientLifecycleObserver
 
 /**

diff --git a/datalayer/grpc/build.gradle.kts b/datalayer/grpc/build.gradle.kts
@@ -96,7 +96,7 @@ protobuf {
             artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
         }
         create("grpc") {
-            artifact = "io.grpc:protoc-gen-grpc-java:1.62.2"
+            artifact = "io.grpc:protoc-gen-grpc-java:1.63.0"
         }
         create("grpckt") {
             artifact = "io.grpc:protoc-gen-grpc-kotlin:1.3.0:jdk8@jar"

diff --git a/datalayer/sample/shared/build.gradle.kts b/datalayer/sample/shared/build.gradle.kts
@@ -81,7 +81,7 @@ protobuf {
             artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
         }
         create("grpc") {
-            artifact = "io.grpc:protoc-gen-grpc-java:1.62.2"
+            artifact = "io.grpc:protoc-gen-grpc-java:1.63.0"
         }
         create("grpckt") {
             artifact = "io.grpc:protoc-gen-grpc-kotlin:1.3.0:jdk8@jar"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,10 +3,10 @@ accompanist = "0.34.0"
 androidx-benchmark = "1.2.3"
 androidx-complications-data = "1.2.1"
 androidx-constraintlayout-compose = "1.0.1"
-androidx-compose-material = "1.7.0-alpha05"
+androidx-compose-material = "1.7.0-alpha06"
 androidx-concurrent = "1.1.0"
 androidx-datastore = "1.0.0"
-androidx-health-services = "1.0.0-rc01"
+androidx-health-services = "1.0.0-rc02"
 androidx-hilt = "1.2.0"
 androidx-media3 = "1.3.0"
 androidx-test-espresso = "3.6.0-alpha03"
@@ -31,13 +31,13 @@ annotation = "1.0.1"
 app-cash-turbine = "1.1.0"
 com-squareup-okhttp3 = "4.12.0"
 com-squareup-retrofit2 = "2.11.0"
-compose = "1.7.0-alpha05"
+compose = "1.7.0-alpha06"
 compose-compiler = "1.5.11"
-compose-material3 = "1.3.0-alpha03"
+compose-material3 = "1.3.0-alpha04"
 composesnapshot = "-"
-dependencyAnalysis = "1.30.0"
+dependencyAnalysis = "1.31.0"
 dokka = "1.9.20"
-googledagger = "2.51"
+googledagger = "2.51.1"
 gradlePlugin = "8.2.2"
 gradlePublishPlugin = "0.28.0"
 io-coil-kt = "2.6.0"
@@ -59,7 +59,7 @@ snapshot-android = "1.0.4"
 spotless = "6.25.0"
 tiles-tooling-preview = "1.3.0"
 truth = "1.4.2"
-wearcompose = "1.4.0-alpha05"
+wearcompose = "1.4.0-alpha06"
 wearToolingPreview = "1.0.0"
 appcompat = "1.6.1"
 material = "1.11.0"
@@ -144,7 +144,7 @@ coil-svg = { module = "io.coil-kt:coil-svg", version.ref = "io-coil-kt" }
 com-squareup-okhttp3-logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "com-squareup-okhttp3" }
 com-squareup-okhttp3-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "com-squareup-okhttp3" }
 com-squareup-okhttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "com-squareup-okhttp3" }
-compose-bom = "androidx.compose:compose-bom:2024.03.00"
+compose-bom = "androidx.compose:compose-bom:2024.04.00"
 compose-foundation-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidx-compose-material" }
 compose-foundation-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "androidx-compose-material" }
 compose-material-iconscore = { module = "androidx.compose.material:material-icons-core", version.ref = "androidx-compose-material" }
@@ -172,10 +172,10 @@ gradleMavenPublishPlugin = { module = "com.vanniktech:gradle-maven-publish-plugi
 hilt-ext-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "androidx-hilt" }
 hilt-ext-work = { module = "androidx.hilt:hilt-work", version.ref = "androidx-hilt" }
 hilt-navigationcompose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidx-hilt" }
-io-grpc-protobuf-lite = "io.grpc:grpc-protobuf-lite:1.62.2"
+io-grpc-protobuf-lite = "io.grpc:grpc-protobuf-lite:1.63.0"
 io-grpc-grpc-kotlin = "io.grpc:grpc-kotlin-stub:1.4.1"
-io-grpc-grpc-android = "io.grpc:grpc-android:1.62.2"
-io-grpc-grpc-binder = "io.grpc:grpc-binder:1.62.2"
+io-grpc-grpc-android = "io.grpc:grpc-android:1.63.0"
+io-grpc-grpc-binder = "io.grpc:grpc-binder:1.63.0"
 google-generativeai = "com.google.ai.client.generativeai:generativeai:0.2.2"
 junit = { module = "junit:junit", version.ref = "junit" }
 kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
@@ -187,7 +187,7 @@ kotlinx-coroutines-guava = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-
 kotlinx-coroutines-playservices = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services", version.ref = "kotlinxCoroutine" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutine" }
 lottie-compose = "com.airbnb.android:lottie-compose:6.4.0"
-mikepenz-markdown = "com.mikepenz:multiplatform-markdown-renderer:0.13.0"
+mikepenz-markdown = "com.mikepenz:multiplatform-markdown-renderer:0.14.0"
 moshi = { module = "com.squareup.moshi:moshi", version.ref = "moshi" }
 moshi-adapters = { module = "com.squareup.moshi:moshi-adapters", version.ref = "moshi" }
 moshi-kotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "moshi" }

diff --git a/...bles/src/main/java/com/google/android/horologist/health/composables/ActiveDurationText.kt b/...bles/src/main/java/com/google/android/horologist/health/composables/ActiveDurationText.kt
@@ -25,12 +25,12 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextAlign
 import androidx.health.services.client.data.ExerciseState
 import androidx.health.services.client.data.ExerciseUpdate
 import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.wear.compose.material.LocalTextStyle
 import androidx.wear.compose.material.Text

diff --git a/media/ui/src/main/java/com/google/android/horologist/media/ui/state/ProgressStateHolder.kt b/media/ui/src/main/java/com/google/android/horologist/media/ui/state/ProgressStateHolder.kt
@@ -24,8 +24,8 @@ import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.withFrameMillis
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.repeatOnLifecycle
 import com.google.android.horologist.annotations.ExperimentalHorologistApi
 import com.google.android.horologist.media.model.TimestampProvider
@@ -80,11 +80,13 @@ internal class ProgressStateHolder(
             val lifecycleOwner = LocalLifecycleOwner.current
             val timestampProvider = LocalTimestampProvider.current
             val stateHolder = remember {
-                val initial = trackPositionUiModel.getCurrentPercent(timestampProvider.getTimestamp())
+                val initial =
+                    trackPositionUiModel.getCurrentPercent(timestampProvider.getTimestamp())
                 ProgressStateHolder(initial, timestampProvider)
             }
             LaunchedEffect(trackPositionUiModel, lifecycleOwner) {
-                val percent = trackPositionUiModel.getCurrentPercent(timestampProvider.getTimestamp())
+                val percent =
+                    trackPositionUiModel.getCurrentPercent(timestampProvider.getTimestamp())
                 stateHolder.setProgress(percent, trackPositionUiModel.shouldAnimate)
                 if (trackPositionUiModel is TrackPositionUiModel.Predictive) {
                     // Prediction only happens when the UI is visible.

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -17,7 +17,7 @@
 import java.util.Properties
 
 plugins {
-    id("com.gradle.enterprise") version "3.16.2"
+    id("com.gradle.enterprise") version "3.17"
 }
 
 gradleEnterprise {