diff --git a/benchmark/src/main/AndroidManifest.xml b/benchmark/src/main/AndroidManifest.xml
index a61497669f..ef40b9d17a 100644
--- a/benchmark/src/main/AndroidManifest.xml
+++ b/benchmark/src/main/AndroidManifest.xml
@@ -1,6 +1,4 @@
-
+
diff --git a/gradle.properties b/gradle.properties
index c935761bcc..a0c1ef5b36 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -34,14 +34,14 @@ TEST_JVM_MEMORY_SIZE=4096M
## Glide versioning
VERSION_MAJOR=4
-VERSION_MINOR=14
+VERSION_MINOR=16
VERSION_PATCH=0
VERSION_NAME=4.14.0-SNAPSHOT
## SDK versioning
-COMPILE_SDK_VERSION=29
+COMPILE_SDK_VERSION=32
MIN_SDK_VERSION=14
-TARGET_SDK_VERSION=28
+TARGET_SDK_VERSION=32
## AndroidX versions
ANDROID_X_ANNOTATION_VERSION=1.3.0
@@ -53,10 +53,10 @@ 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_TEST_CORE_VERSION=1.4.0
+ANDROID_X_TEST_JUNIT_VERSION=1.1.3
+ANDROID_X_TEST_RULES_VERSION=1.4.0
+ANDROID_X_TEST_RUNNER_VERSION=1.4.0
ANDROID_X_TRACING_VERSION=1.0.0
ANDROID_X_VECTOR_DRAWABLE_ANIMATED_VERSION=1.1.0
ANDROID_X_CORE_KTX_VERSION=1.8.0
@@ -85,7 +85,7 @@ MOCKITO_VERSION=2.24.0
MOCKWEBSERVER_VERSION=3.0.0-RC1
OK_HTTP_VERSION=3.10.0
PMD_VERSION=6.0.0
-ROBOLECTRIC_VERSION=4.3.1
+ROBOLECTRIC_VERSION=4.8.1
TRUTH_VERSION=0.45
VIOLATIONS_PLUGIN_VERSION=1.8
VOLLEY_VERSION=1.2.0
diff --git a/instrumentation/build.gradle b/instrumentation/build.gradle
index 00bf8c3686..d80aa5742a 100644
--- a/instrumentation/build.gradle
+++ b/instrumentation/build.gradle
@@ -26,11 +26,11 @@ dependencies {
}
android {
- compileSdk COMPILE_SDK_VERSION as int
+ compileSdk 30 as int
defaultConfig {
applicationId 'com.bumptech.glide.instrumentation'
- minSdk 16 as int
+ minSdk MIN_SDK_VERSION as int
targetSdk TARGET_SDK_VERSION as int
versionCode 1
versionName '1.0'
@@ -38,8 +38,8 @@ android {
}
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_7
- targetCompatibility JavaVersion.VERSION_1_7
+ sourceCompatibility JavaVersion.VERSION_11
+ targetCompatibility JavaVersion.VERSION_11
}
}
diff --git a/instrumentation/src/main/AndroidManifest.xml b/instrumentation/src/main/AndroidManifest.xml
index 894db86e43..f093722782 100644
--- a/instrumentation/src/main/AndroidManifest.xml
+++ b/instrumentation/src/main/AndroidManifest.xml
@@ -1,9 +1,15 @@
-
+ xmlns:tools="http://schemas.android.com/tools"
+ package="com.bumptech.glide.instrumentation">
+
-
-
-
+
+
+
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index cdae5bd7b8..705db20aa4 100644
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-
+
diff --git a/library/test/build.gradle b/library/test/build.gradle
index a3ceadf5b0..a298c55c52 100644
--- a/library/test/build.gradle
+++ b/library/test/build.gradle
@@ -47,8 +47,8 @@ android {
}
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_7
- targetCompatibility JavaVersion.VERSION_1_7
+ sourceCompatibility JavaVersion.VERSION_11
+ targetCompatibility JavaVersion.VERSION_11
}
testOptions.unitTests.includeAndroidResources = true
diff --git a/samples/contacturi/src/main/AndroidManifest.xml b/samples/contacturi/src/main/AndroidManifest.xml
index 50cd63461f..e4914780b5 100644
--- a/samples/contacturi/src/main/AndroidManifest.xml
+++ b/samples/contacturi/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
android:theme="@style/Theme.AppCompat" >
+ android:exported="true">
diff --git a/samples/flickr/src/main/AndroidManifest.xml b/samples/flickr/src/main/AndroidManifest.xml
index 72dcad1804..9b0acf8d64 100644
--- a/samples/flickr/src/main/AndroidManifest.xml
+++ b/samples/flickr/src/main/AndroidManifest.xml
@@ -20,7 +20,7 @@
@@ -29,6 +29,8 @@
-
+
diff --git a/samples/giphy/src/main/AndroidManifest.xml b/samples/giphy/src/main/AndroidManifest.xml
index 469e1295a1..9e6e770df0 100644
--- a/samples/giphy/src/main/AndroidManifest.xml
+++ b/samples/giphy/src/main/AndroidManifest.xml
@@ -17,13 +17,15 @@
android:theme="@style/AppTheme">
+ android:exported="true">
-
+
diff --git a/samples/imgur/src/main/AndroidManifest.xml b/samples/imgur/src/main/AndroidManifest.xml
index 332baeff6f..3e3fa4c1fe 100644
--- a/samples/imgur/src/main/AndroidManifest.xml
+++ b/samples/imgur/src/main/AndroidManifest.xml
@@ -18,7 +18,9 @@
android:networkSecurityConfig="@xml/network_security_config"
android:name="com.bumptech.glide.samples.imgur.ImgurApplication"
tools:targetApi="n">
-
+
diff --git a/samples/svg/src/main/AndroidManifest.xml b/samples/svg/src/main/AndroidManifest.xml
index bb5888e5e6..24cee5a197 100644
--- a/samples/svg/src/main/AndroidManifest.xml
+++ b/samples/svg/src/main/AndroidManifest.xml
@@ -9,8 +9,8 @@
android:icon="@android:drawable/sym_def_app_icon"
android:label="@string/app_name">
+ android:exported="true"
+ android:name=".MainActivity">
diff --git a/testutil/build.gradle b/testutil/build.gradle
index 7c5ea6591b..e570898dc1 100644
--- a/testutil/build.gradle
+++ b/testutil/build.gradle
@@ -18,7 +18,7 @@ android {
}
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_7
- targetCompatibility JavaVersion.VERSION_1_7
+ sourceCompatibility JavaVersion.VERSION_11
+ targetCompatibility JavaVersion.VERSION_11
}
}