Skip to content

Commit

Permalink
Update all dependencies (#2248)
Browse files Browse the repository at this point in the history
  • Loading branch information
yschimke authored May 31, 2024
1 parent bef6f97 commit 766fdc2
Show file tree
Hide file tree
Showing 33 changed files with 99 additions and 63 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
* limitations under the License.
*/

@file:Suppress("DEPRECATION")

package com.google.android.horologist.auth.data.googlesignin

import com.google.android.gms.auth.api.signin.GoogleSignInAccount
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
* limitations under the License.
*/

@file:Suppress("DEPRECATION")

package com.google.android.horologist.auth.data.googlesignin

import com.google.android.gms.auth.api.signin.GoogleSignInAccount
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
* limitations under the License.
*/

@file:Suppress("DEPRECATION")

package com.google.android.horologist.auth.sample.screens.googlesignin.signin

import android.util.Log
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
* limitations under the License.
*/

@file:Suppress("DEPRECATION")

package com.google.android.horologist.auth.ui.googlesignin.mapper

import com.google.android.gms.auth.api.signin.GoogleSignInAccount
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public fun MarqueeText(
.semantics { focused = true }
.basicMarquee(
iterations = Int.MAX_VALUE,
delayMillis = pauseTime.inWholeMilliseconds.toInt(),
repeatDelayMillis = pauseTime.inWholeMilliseconds.toInt(),
initialDelayMillis = pauseTime.inWholeMilliseconds.toInt(),
spacing = MarqueeSpacing(followGap),
velocity = marqueeDpPerSecond,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import java.time.LocalDate

@RunWith(RobolectricTestRunner::class)
@Config(
sdk = [30],
sdk = [33],
qualifiers = "w227dp-h227dp-small-notlong-round-watch-xhdpi-keyshidden-nonav",
)
@GraphicsMode(GraphicsMode.Mode.NATIVE)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import org.junit.Test
import org.robolectric.annotation.Config

@Config(
sdk = [30],
sdk = [33],
qualifiers = "w227dp-h227dp-small-notlong-notround-watch-xhdpi-keyshidden-nonav",
)
class SquareSegmentedProgressIndicatorTest :
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*
* Copyright 2024 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.google.android.horologist.compose.pager

import androidx.compose.foundation.pager.PagerState
import androidx.compose.runtime.Composable
import androidx.wear.compose.ui.tooling.preview.WearPreviewDevices

@WearPreviewDevices
@Composable
fun VerticalPagerIndicatorPreview() {
val state = PagerState(1) {
10
}
VerticalPageIndicator(pageIndicatorState = PageScreenIndicatorState(state))
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package com.google.android.horologist.compose.pager

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
Expand Down Expand Up @@ -47,16 +49,20 @@ fun VerticalPageIndicator(
spacing: Dp = 4.dp,
indicatorShape: Shape = CircleShape,
) {
HorizontalPageIndicator(
pageIndicatorState = pageIndicatorState,
Box(
modifier = modifier
.fillMaxSize()
.rotate(90f)
.scale(scaleY = -1f, scaleX = 1f),
indicatorStyle = indicatorStyle,
selectedColor = selectedColor,
unselectedColor = unselectedColor,
indicatorSize = indicatorSize,
spacing = spacing,
indicatorShape = indicatorShape,
)
) {
HorizontalPageIndicator(
pageIndicatorState = pageIndicatorState,
indicatorStyle = indicatorStyle,
selectedColor = selectedColor,
unselectedColor = unselectedColor,
indicatorSize = indicatorSize,
spacing = spacing,
indicatorShape = indicatorShape,
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class FillMaxRectangleTest {

@Test
@Config(
sdk = [30],
sdk = [33],
qualifiers = "w227dp-h227dp-small-notlong-notround-watch-xhdpi-keyshidden-nonav",
)
fun testSquare() {
Expand All @@ -58,7 +58,7 @@ class FillMaxRectangleTest {

@Test
@Config(
sdk = [30],
sdk = [33],
qualifiers = "w227dp-h227dp-small-notlong-round-watch-xhdpi-keyshidden-nonav",
)
fun testCircle() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ import org.robolectric.annotation.Config
@MediumTest
@RunWith(RobolectricTestRunner::class)
@Config(
sdk = [30],
sdk = [33],
qualifiers = "w227dp-h227dp-small-notlong-round-watch-xhdpi-keyshidden-nonav",
)
@Ignore("Failing with robolectric")
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 8 additions & 8 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ androidx-test-runner = "1.6.0-beta01"
androidx-wear-watchface = "1.2.1"
androidxActivity = "1.9.0"
androidxCore = "1.13.1"
androidxLifecycle = "2.8.0"
androidxNavigation = "2.8.0-beta01"
androidxLifecycle = "2.8.1"
androidxNavigation = "2.8.0-beta02"
androidxPhoneInteractions = "1.1.0-alpha04"
androidxRemoteInteractions = "1.1.0-alpha02"
androidxStartup = "1.1.1"
Expand All @@ -28,9 +28,9 @@ annotation = "1.0.1"
app-cash-turbine = "1.1.0"
com-squareup-okhttp3 = "5.0.0-alpha.14"
com-squareup-retrofit2 = "2.11.0"
compose = "1.7.0-beta01"
compose = "1.7.0-beta02"
compose-compiler = "1.5.14"
compose-material3 = "1.3.0-beta01"
compose-material3 = "1.3.0-beta02"
composesnapshot = "-"
dependencyAnalysis = "1.32.0"
dokka = "1.9.20"
Expand All @@ -56,9 +56,9 @@ runtimeTracing = "1.0.0-beta01"
spotless = "6.25.0"
tiles-tooling-preview = "1.3.0"
truth = "1.4.2"
wearcompose = "1.4.0-beta01"
wearcompose = "1.4.0-beta02"
wearToolingPreview = "1.0.0"
appcompat = "1.6.1"
appcompat = "1.7.0"
material = "1.12.0"
wearInput = "1.2.0-alpha02"

Expand Down Expand Up @@ -188,8 +188,8 @@ moshi-kotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "mosh
moshi-kotlin-codegen = { module = "com.squareup.moshi:moshi-kotlin-codegen", version.ref = "moshi" }
okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
playservices-auth = { module = "com.google.android.gms:play-services-auth", version.ref = "playServicesAuth" }
playservices-base = "com.google.android.gms:play-services-base:18.4.0"
playservices-wearable = "com.google.android.gms:play-services-wearable:18.1.0"
playservices-base = "com.google.android.gms:play-services-base:18.5.0"
playservices-wearable = "com.google.android.gms:play-services-wearable:18.2.0"
protobuf-kotlin-lite = { module = "com.google.protobuf:protobuf-kotlin-lite", version.ref = "protobuf" }
retrofit2-convertermoshi = { module = "com.squareup.retrofit2:converter-moshi", version.ref = "com-squareup-retrofit2" }
retrofit2-retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "com-squareup-retrofit2" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ class MetricsScreenTest : WearLegacyScreenTest() {
}

@Config(
sdk = [30],
qualifiers = largeScreen,
)
@Test
Expand Down Expand Up @@ -179,7 +178,6 @@ class MetricsScreenTest : WearLegacyScreenTest() {
}

@Config(
sdk = [30],
qualifiers = smallScreen,
)
@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import android.media.MediaRouter as MediaRouterLegacy
@MediumTest
@RunWith(RobolectricTestRunner::class)
@Config(
sdk = [30],
sdk = [33],
)
class SystemAudioRepositoryTest {
private lateinit var mediaRouter: MediaRouter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import org.robolectric.annotation.Config
import org.robolectric.annotation.GraphicsMode

@RunWith(RobolectricTestRunner::class)
@Config(application = HiltTestApplication::class, sdk = [30])
@Config(application = HiltTestApplication::class, sdk = [33])
@GraphicsMode(GraphicsMode.Mode.NATIVE)
abstract class BaseAppTest {
@get:Rule
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ class MediaPlayerA11yScreenshotTest : WearLegacyA11yTest() {
}

@Config(
sdk = [30],
qualifiers = "+w192dp-h192dp",
)
@Test
Expand All @@ -44,7 +43,6 @@ class MediaPlayerA11yScreenshotTest : WearLegacyA11yTest() {
}

@Config(
sdk = [30],
qualifiers = "w180dp-h180dp-small-notlong-notround-watch-xhdpi-keyshidden-nonav",
)
@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ class MediaPlayerDeviceScreenTest : WearLegacyScreenTest() {
}

@Config(
sdk = [30],
qualifiers = "+w192dp-h192dp",
)
@Test
Expand All @@ -42,7 +41,6 @@ class MediaPlayerDeviceScreenTest : WearLegacyScreenTest() {
}

@Config(
sdk = [30],
qualifiers = "w192dp-h192dp-small-notlong-round-watch-hdpi-keyshidden-nonav",
)
@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ class MediaCollectionsTileTest : WearLegacyScreenTest() {
}

@Config(
sdk = [30],
qualifiers = "+w192dp-h192dp",
)
@Test
Expand All @@ -44,7 +43,6 @@ class MediaCollectionsTileTest : WearLegacyScreenTest() {
}

@Config(
sdk = [30],
qualifiers = "w192dp-h192dp-small-notlong-round-watch-hdpi-keyshidden-nonav",
)
@Test
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 766fdc2

Please sign in to comment.