From 46778db594edc5915987dcd6e737fa7d15414690 Mon Sep 17 00:00:00 2001 From: leticiars Date: Tue, 9 May 2023 13:36:55 -0400 Subject: [PATCH] [Gradle] Update AppCompat dependency to 1.6.1 This fixes Proguard warnings about ShadowDrawableWrapper. Resolves https://github.com/material-components/material-components-android/issues/3374 PiperOrigin-RevId: 530651081 --- build.gradle | 2 +- .../android/material/shadow/ShadowDrawableWrapper.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index d9a3aaac5ce..8e2d5049dce 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ ext { androidXVersions = [ annotation : '1.2.0', - appCompat : '1.5.0', + appCompat : '1.6.1', cardView : '1.0.0', constraintlayout : '2.0.1', coordinatorlayout : '1.1.0', diff --git a/lib/java/com/google/android/material/shadow/ShadowDrawableWrapper.java b/lib/java/com/google/android/material/shadow/ShadowDrawableWrapper.java index 9b45cb8cf70..8669e80214c 100644 --- a/lib/java/com/google/android/material/shadow/ShadowDrawableWrapper.java +++ b/lib/java/com/google/android/material/shadow/ShadowDrawableWrapper.java @@ -29,7 +29,7 @@ import android.graphics.RectF; import android.graphics.Shader; import android.graphics.drawable.Drawable; -import androidx.appcompat.graphics.drawable.DrawableWrapper; +import androidx.appcompat.graphics.drawable.DrawableWrapperCompat; import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; @@ -40,7 +40,7 @@ * @deprecated Use {@link com.google.android.material.shape.MaterialShapeDrawable} instead. */ @Deprecated -public class ShadowDrawableWrapper extends DrawableWrapper { +public class ShadowDrawableWrapper extends DrawableWrapperCompat { // used to calculate content padding static final double COS_45 = Math.cos(Math.toRadians(45)); @@ -365,7 +365,7 @@ private void buildComponents(@NonNull Rect bounds) { bounds.right - rawMaxShadowSize, bounds.bottom - verticalOffset); - getWrappedDrawable() + getDrawable() .setBounds( (int) contentBounds.left, (int) contentBounds.top,