aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com>2022-09-08 04:56:50 +0000
committerGitHub <noreply@github.com>2022-09-08 04:56:50 +0000
commitddef295aa69f66296e71260e2970f9c77d637bab (patch)
treeb15b35c5628bb6c085bf644e896197cd573f4f8e
parent76f77073ecfc72021efa5ef43af05088f3a8e859 (diff)
fix(deps): update dependency androidx.compose.material3:material3 to v1.0.0-beta02 (#2115)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
-rw-r--r--.github/renovate.json14
-rw-r--r--gradle/libs.versions.toml4
-rw-r--r--ui-compose/src/main/kotlin/app/passwordstore/ui/APSAppBar.kt4
3 files changed, 17 insertions, 5 deletions
diff --git a/.github/renovate.json b/.github/renovate.json
index 5b9d9cdd..f83079c8 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -5,8 +5,20 @@
],
"packageRules": [
{
- "matchPackagePatterns": ["^kotlin", "^org.jetbrains.kotlin"],
+ "matchPackagePatterns": [
+ "^kotlin",
+ "^org.jetbrains.kotlin"
+ ],
"groupName": "kotlin"
+ },
+ {
+ "managers": [
+ "gradle"
+ ],
+ "matchPackagePatterns": [
+ "^androidx.appcompat"
+ ],
+ "enabled": false
}
],
"regexManagers": [
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5c58acee..280cc139 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -17,7 +17,7 @@ androidx-activity-compose = { module = "androidx.activity:activity-compose", ver
androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidxActivity" }
androidx-annotation = "androidx.annotation:annotation:1.5.0-rc01"
# @pin beta01 moved DrawableWrapper to public API, breaking the FastScroll library
-androidx-appcompat = "androidx.appcompat:appcompat:1.6.0-rc01"
+androidx-appcompat = "androidx.appcompat:appcompat:1.6.0-alpha05"
androidx-autofill = "androidx.autofill:autofill:1.2.0-beta01"
androidx-biometricKtx = "androidx.biometric:biometric-ktx:1.2.0-alpha04"
androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.2.0-alpha03"
@@ -55,7 +55,7 @@ compose-foundation-core = { module = "androidx.compose.foundation:foundation", v
compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "composeFoundation" }
compose-hilt = "androidx.hilt:hilt-navigation-compose:1.0.0"
compose-material = "androidx.compose.material:material:1.2.1"
-compose-material3 = "androidx.compose.material3:material3:1.0.0-beta01"
+compose-material3 = "androidx.compose.material3:material3:1.0.0-beta02"
compose-runtime = "androidx.compose.runtime:runtime:1.3.0-beta02"
compose-ui-core = { module = "androidx.compose.ui:ui", version.ref = "composeUi" }
compose-ui-test = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "composeUi" }
diff --git a/ui-compose/src/main/kotlin/app/passwordstore/ui/APSAppBar.kt b/ui-compose/src/main/kotlin/app/passwordstore/ui/APSAppBar.kt
index 17fb1c5b..1793b674 100644
--- a/ui-compose/src/main/kotlin/app/passwordstore/ui/APSAppBar.kt
+++ b/ui-compose/src/main/kotlin/app/passwordstore/ui/APSAppBar.kt
@@ -3,8 +3,8 @@ package app.passwordstore.ui
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
-import androidx.compose.material3.SmallTopAppBar
import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
@@ -20,7 +20,7 @@ public fun APSAppBar(
onNavigationIconClick: (() -> Unit)?,
modifier: Modifier = Modifier,
) {
- SmallTopAppBar(
+ TopAppBar(
title = { Text(text = title) },
navigationIcon = {
if (navigationIcon != null) {