From 6e97f93a379790ee91c7124a8532317cd1a402c4 Mon Sep 17 00:00:00 2001 From: Sam Judd Date: Mon, 25 Sep 2023 13:13:25 -0700 Subject: [PATCH] Update compile sdk to 34, androidx core to 1.12.0 --- .../load/engine/bitmap_recycle/SizeConfigStrategyTest.java | 4 ++-- settings.gradle | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/library/test/src/test/java/com/bumptech/glide/load/engine/bitmap_recycle/SizeConfigStrategyTest.java b/library/test/src/test/java/com/bumptech/glide/load/engine/bitmap_recycle/SizeConfigStrategyTest.java index ddfd6d4ab6..6c9321bd98 100644 --- a/library/test/src/test/java/com/bumptech/glide/load/engine/bitmap_recycle/SizeConfigStrategyTest.java +++ b/library/test/src/test/java/com/bumptech/glide/load/engine/bitmap_recycle/SizeConfigStrategyTest.java @@ -1,15 +1,15 @@ package com.bumptech.glide.load.engine.bitmap_recycle; import android.graphics.Bitmap; +import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.common.testing.EqualsTester; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -@RunWith(JUnit4.class) +@RunWith(AndroidJUnit4.class) public class SizeConfigStrategyTest { @Mock private SizeConfigStrategy.KeyPool pool; diff --git a/settings.gradle b/settings.gradle index addb82c18e..40316e084d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -46,7 +46,7 @@ dependencyResolutionManagement { versionCatalogs { libs { // Versions for things other than dependencies - version('compile-sdk-version', 'android-33') + version('compile-sdk-version', 'android-34') version('min-sdk-version', '14') version('okhttp-min-sdk-version', '21') version('target-sdk-version', '32') @@ -73,7 +73,7 @@ dependencyResolutionManagement { library('autoservice.annotations', 'com.google.auto.service:auto-service-annotations:1.0.1') library('android-gradle', 'com.android.tools.build:gradle:8.1.0') library('androidx-cardview', 'androidx.cardview:cardview:1.0.0') - library('androidx-core', 'androidx.core:core:1.6.0') + library('androidx-core', 'androidx.core:core:1.12.0') library('androidx-annotation', 'androidx.annotation:annotation:1.6.0') library('androidx-appcompat', 'androidx.appcompat:appcompat:1.6.1') library('androidx-benchmark.gradle', 'androidx.benchmark', 'benchmark-gradle-plugin').versionRef('androidx-benchmark')