From b8fb588c2dcba0792747ccc1374b923bd9e1926a Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Tue, 5 Jul 2022 17:56:30 -0400 Subject: [PATCH] Update AndroidX libraries --- gradle.properties | 16 ++++++++-------- .../resource/bitmap/TransformationUtils.java | 2 +- .../resource/bitmap/TransformationUtilsTest.java | 2 +- .../glide/samples/flickr/FlickrPhotoGrid.java | 2 +- .../glide/samples/flickr/FlickrPhotoList.java | 2 +- .../samples/flickr/FlickrSearchActivity.java | 3 ++- .../glide/samples/giphy/MainActivity.java | 2 +- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9aef25bd94..21eca1c445 100644 --- a/gradle.properties +++ b/gradle.properties @@ -44,21 +44,21 @@ MIN_SDK_VERSION=14 TARGET_SDK_VERSION=28 ## AndroidX versions -ANDROID_X_ANNOTATION_VERSION=1.1.0 -ANDROID_X_APPCOMPAT_VERSION=1.0.0 -ANDROID_X_BENCHMARK_VERSION=1.0.0 +ANDROID_X_ANNOTATION_VERSION=1.3.0 +ANDROID_X_APPCOMPAT_VERSION=1.3.1 +ANDROID_X_BENCHMARK_VERSION=1.1.0 ANDROID_X_CARDVIEW_VERSION=1.0.0 ANDROID_X_CONCURRENT_FUTURES_VERSION=1.1.0 -ANDROID_X_CORE_VERSION=1.0.0 -ANDROID_X_EXIF_INTERFACE_VERSION=1.2.0 -ANDROID_X_FRAGMENT_VERSION=1.3.1 -ANDROID_X_RECYCLERVIEW_VERSION=1.0.0 +ANDROID_X_CORE_VERSION=1.6.0 +ANDROID_X_EXIF_INTERFACE_VERSION=1.3.3 +ANDROID_X_FRAGMENT_VERSION=1.3.6 +ANDROID_X_RECYCLERVIEW_VERSION=1.2.1 ANDROID_X_TEST_CORE_VERSION=1.3.0 ANDROID_X_TEST_JUNIT_VERSION=1.1.0 ANDROID_X_TEST_RULES_VERSION=1.1.0 ANDROID_X_TEST_RUNNER_VERSION=1.1.0 ANDROID_X_TRACING_VERSION=1.0.0 -ANDROID_X_VECTOR_DRAWABLE_ANIMATED_VERSION=1.0.0 +ANDROID_X_VECTOR_DRAWABLE_ANIMATED_VERSION=1.1.0 ANDROID_X_CORE_KTX_VERSION=1.8.0 ANDROID_X_LIFECYCLE_KTX_VERSION=2.4.1 diff --git a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/TransformationUtils.java b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/TransformationUtils.java index c663713917..1d10d949d9 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/TransformationUtils.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/TransformationUtils.java @@ -12,11 +12,11 @@ import android.graphics.PorterDuffXfermode; import android.graphics.RectF; import android.graphics.Shader; -import android.media.ExifInterface; import android.os.Build; import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; +import androidx.exifinterface.media.ExifInterface; import com.bumptech.glide.load.Transformation; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.util.Preconditions; diff --git a/library/test/src/test/java/com/bumptech/glide/load/resource/bitmap/TransformationUtilsTest.java b/library/test/src/test/java/com/bumptech/glide/load/resource/bitmap/TransformationUtilsTest.java index 36176b1fc6..51d7a96f66 100644 --- a/library/test/src/test/java/com/bumptech/glide/load/resource/bitmap/TransformationUtilsTest.java +++ b/library/test/src/test/java/com/bumptech/glide/load/resource/bitmap/TransformationUtilsTest.java @@ -14,7 +14,7 @@ import android.graphics.Bitmap; import android.graphics.Matrix; -import android.media.ExifInterface; +import androidx.exifinterface.media.ExifInterface; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.tests.Util; import com.bumptech.glide.util.Preconditions; diff --git a/samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/FlickrPhotoGrid.java b/samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/FlickrPhotoGrid.java index b924c6660d..3c260e35c6 100644 --- a/samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/FlickrPhotoGrid.java +++ b/samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/FlickrPhotoGrid.java @@ -86,7 +86,7 @@ public void getItemOffsets( outRect.set(gridMargin, gridMargin, gridMargin, gridMargin); } }); - grid.setRecyclerListener( + grid.addRecyclerListener( new RecyclerView.RecyclerListener() { @Override public void onViewRecycled(RecyclerView.ViewHolder holder) { diff --git a/samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/FlickrPhotoList.java b/samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/FlickrPhotoList.java index 164275b870..24532027fd 100644 --- a/samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/FlickrPhotoList.java +++ b/samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/FlickrPhotoList.java @@ -87,7 +87,7 @@ public View onCreateView( .override(Api.SQUARE_THUMB_SIZE) .transition(withCrossFade()); - list.setRecyclerListener( + list.addRecyclerListener( new RecyclerView.RecyclerListener() { @Override public void onViewRecycled(RecyclerView.ViewHolder holder) { diff --git a/samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/FlickrSearchActivity.java b/samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/FlickrSearchActivity.java index cf1bcc44e9..103e0db2a7 100644 --- a/samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/FlickrSearchActivity.java +++ b/samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/FlickrSearchActivity.java @@ -15,6 +15,7 @@ import android.view.ViewGroup; import android.widget.SearchView; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; @@ -164,7 +165,7 @@ private int getScreenWidth() { } @Override - protected void onSaveInstanceState(Bundle outState) { + protected void onSaveInstanceState(@NonNull Bundle outState) { super.onSaveInstanceState(outState); if (currentQuery != null) { outState.putParcelable(STATE_QUERY, currentQuery); diff --git a/samples/giphy/src/main/java/com/bumptech/glide/samples/giphy/MainActivity.java b/samples/giphy/src/main/java/com/bumptech/glide/samples/giphy/MainActivity.java index bf9327d941..368086fee4 100644 --- a/samples/giphy/src/main/java/com/bumptech/glide/samples/giphy/MainActivity.java +++ b/samples/giphy/src/main/java/com/bumptech/glide/samples/giphy/MainActivity.java @@ -52,7 +52,7 @@ protected void onCreate(Bundle savedInstanceState) { RecyclerViewPreloader preloader = new RecyclerViewPreloader<>(GlideApp.with(this), adapter, preloadSizeProvider, 4); gifList.addOnScrollListener(preloader); - gifList.setRecyclerListener( + gifList.addRecyclerListener( new RecyclerListener() { @Override public void onViewRecycled(ViewHolder holder) {