Skip to content

Commit 139da88

Browse files
committed
Update dependencies
1 parent e4c558c commit 139da88

File tree

6 files changed

+200
-135
lines changed

6 files changed

+200
-135
lines changed

appwidget-viewer/src/main/java/com/google/android/glance/tools/viewer/ui/ViewerScreen.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,18 @@ import androidx.compose.material.ExperimentalMaterialApi
2828
import androidx.compose.material.ModalBottomSheetLayout
2929
import androidx.compose.material.ModalBottomSheetValue
3030
import androidx.compose.material.icons.Icons
31+
import androidx.compose.material.icons.automirrored.rounded.KeyboardArrowRight
3132
import androidx.compose.material.icons.outlined.Description
3233
import androidx.compose.material.icons.outlined.PushPin
3334
import androidx.compose.material.icons.outlined.Refresh
3435
import androidx.compose.material.icons.outlined.Tune
3536
import androidx.compose.material.icons.rounded.Done
36-
import androidx.compose.material.icons.rounded.KeyboardArrowRight
3737
import androidx.compose.material.icons.rounded.Menu
3838
import androidx.compose.material.icons.rounded.Share
3939
import androidx.compose.material.rememberModalBottomSheetState
4040
import androidx.compose.material3.BottomAppBar
4141
import androidx.compose.material3.DrawerState
4242
import androidx.compose.material3.DrawerValue
43-
import androidx.compose.material3.ExperimentalMaterial3Api
4443
import androidx.compose.material3.FloatingActionButton
4544
import androidx.compose.material3.Icon
4645
import androidx.compose.material3.IconButton
@@ -74,7 +73,7 @@ import com.google.android.glance.appwidget.host.requestPin
7473
import kotlinx.coroutines.delay
7574
import kotlinx.coroutines.launch
7675

77-
@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
76+
@OptIn(ExperimentalMaterialApi::class)
7877
@Composable
7978
internal fun ViewerScreen(
8079
providers: List<AppWidgetProviderInfo>,
@@ -130,6 +129,7 @@ internal fun ViewerScreen(
130129
currentSize = currentSize,
131130
onSizeChange = onResize
132131
)
132+
133133
ViewerPanel.Info -> ViewerInfoPanel(selectedProvider)
134134
}
135135
}
@@ -230,7 +230,6 @@ private suspend fun doExport(
230230
}
231231
}
232232

233-
@OptIn(ExperimentalMaterial3Api::class)
234233
@Composable
235234
private fun ViewerBottomBar(
236235
drawerState: DrawerState,
@@ -318,7 +317,6 @@ private fun ViewerBottomBar(
318317
}
319318

320319
@Composable
321-
@OptIn(ExperimentalMaterial3Api::class)
322320
private fun ViewerDrawer(
323321
providers: List<AppWidgetProviderInfo>,
324322
selectedProvider: AppWidgetProviderInfo,
@@ -339,7 +337,7 @@ private fun ViewerDrawer(
339337
imageVector = if (selectedProvider == item) {
340338
Icons.Rounded.Done
341339
} else {
342-
Icons.Rounded.KeyboardArrowRight
340+
Icons.AutoMirrored.Rounded.KeyboardArrowRight
343341
},
344342
contentDescription = null
345343
)

gradle/libs.versions.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
[versions]
2-
composeCompiler = "1.5.3"
2+
composeCompiler = "1.5.14"
33
composesnapshot = "-" # a single character = no snapshot
4-
androidx-compose-bom = "2023.10.00"
4+
androidx-compose-bom = "2024.05.00"
55

66
glance = "1.1.0-SNAPSHOT"
77
glancesnapshot = "11101881" # a single character = no snapshot
88

99
# gradlePlugin and lint need to be updated together
10-
gradlePlugin = "8.1.3"
11-
lintMinCompose = "31.1.2"
10+
gradlePlugin = "8.4.1"
11+
lintMinCompose = "31.4.1"
1212

1313
ktlint = "0.42.1"
14-
kotlin = "1.9.10"
15-
coroutines = "1.7.1"
14+
kotlin = "1.9.24"
15+
coroutines = "1.8.1"
1616

1717
androidxtest-core = "1.5.0"
1818
androidxtest-rules = "1.5.0"
@@ -41,7 +41,7 @@ compose-material-material3 = { module = "androidx.compose.material3:material3" }
4141

4242
glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref = "glance" }
4343

44-
google-material = "com.google.android.material:material:1.10.0"
44+
google-material = "com.google.android.material:material:1.12.0"
4545

4646
android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "gradlePlugin" }
4747
gradleMavenPublishPlugin = "com.vanniktech:gradle-maven-publish-plugin:0.25.3"
@@ -58,15 +58,15 @@ kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-te
5858

5959
dokka = "org.jetbrains.dokka:dokka-gradle-plugin:1.9.10"
6060

61-
androidx-core = "androidx.core:core-ktx:1.12.0"
61+
androidx-core = "androidx.core:core-ktx:1.13.1"
6262
androidx-core-remoteviews = "androidx.core:core-remoteviews:1.0.0"
63-
androidx-activity-compose = "androidx.activity:activity-compose:1.8.0"
63+
androidx-activity-compose = "androidx.activity:activity-compose:1.9.0"
6464

6565
androidx-test-core = { module = "androidx.test:core-ktx", version.ref = "androidxtest-core" }
6666
androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidxtest-runner" }
6767
androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidxtest-rules" }
6868
androidx-test-orchestrator = { module = "androidx.test:orchestrator", version.ref = "androidxtest-orchestrator" }
69-
androidx-test-uiAutomator = "androidx.test.uiautomator:uiautomator:2.2.0"
69+
androidx-test-uiAutomator = "androidx.test.uiautomator:uiautomator:2.3.0"
7070

7171
# alpha for robolectric x compose fix
7272
androidx-test-espressoCore = "androidx.test.espresso:espresso-core:3.5.1"
@@ -86,4 +86,4 @@ android-tools-lint-lint = { module = "com.android.tools.lint:lint", version.ref
8686
android-tools-lint-api = { module = "com.android.tools.lint:lint-api", version.ref = "lintMinCompose" }
8787
android-tools-lint-tests = { module = "com.android.tools.lint:lint-tests", version.ref = "lintMinCompose" }
8888
[plugins]
89-
roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi"}
89+
roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi"}

gradle/wrapper/gradle-wrapper.jar

-15.4 KB
Binary file not shown.
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Thu Aug 25 11:00:02 CEST 2022
21
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME
7+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)