From 5a9d4f2e3797d991f6f534767abdce62c922b29b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 5 Sep 2025 16:39:25 +0000 Subject: [PATCH 1/2] fix(deps): update dependency com.google.android.material:material to v1.13.0 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- core/build.gradle | 2 +- gradle/verification-metadata.xml | 34 ++++++++++++++++++++++++++++++++ sample/build.gradle | 2 +- ui/build.gradle | 2 +- 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 35b9dfb7..bf5abc4e 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -40,7 +40,7 @@ android { dependencies { implementation 'androidx.core:core-ktx:1.16.0' implementation 'androidx.appcompat:appcompat:1.7.1' - implementation 'com.google.android.material:material:1.12.0' + implementation 'com.google.android.material:material:1.13.0' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.3.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0' diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 7015c20b..36419e2a 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -63,6 +63,7 @@ + @@ -197,6 +198,7 @@ + @@ -2109,6 +2111,14 @@ + + + + + + + + @@ -2133,6 +2143,14 @@ + + + + + + + + @@ -3685,6 +3703,14 @@ + + + + + + + + @@ -10040,6 +10066,14 @@ + + + + + + + + diff --git a/sample/build.gradle b/sample/build.gradle index 67564c3d..991481a5 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -45,7 +45,7 @@ android { dependencies { implementation 'androidx.core:core-ktx:1.16.0' implementation 'androidx.appcompat:appcompat:1.7.1' - implementation 'com.google.android.material:material:1.12.0' + implementation 'com.google.android.material:material:1.13.0' implementation 'androidx.constraintlayout:constraintlayout:2.2.1' implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.9.3' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.3' diff --git a/ui/build.gradle b/ui/build.gradle index 5e829895..a1802dac 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -61,7 +61,7 @@ dependencies { implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' - implementation 'com.google.android.material:material:1.12.0' + implementation 'com.google.android.material:material:1.13.0' implementation "com.google.dagger:dagger:${daggerVersion}" kapt "com.google.dagger:dagger-compiler:${daggerVersion}" From a3096c3d6a57cc4d2e09090b79fdcd07130dd911 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sat, 6 Sep 2025 18:00:34 +0200 Subject: [PATCH 2/2] fix(dialog): Use androidx reference since R references are now transitive Signed-off-by: Andy Scherzinger --- .../android/common/ui/theme/utils/DialogViewThemeUtils.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/DialogViewThemeUtils.kt b/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/DialogViewThemeUtils.kt index 1efaddb6..477292f3 100644 --- a/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/DialogViewThemeUtils.kt +++ b/ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/DialogViewThemeUtils.kt @@ -44,7 +44,7 @@ class DialogViewThemeUtils MaterialShapeDrawable( context, null, - com.google.android.material.R.attr.alertDialogStyle, + androidx.appcompat.R.attr.alertDialogStyle, com.google.android.material.R.style.MaterialAlertDialog_MaterialComponents ) materialShapeDrawable.initializeElevationOverlay(context)