From 839899dd252c58045b992181791d2aa9412bfdc0 Mon Sep 17 00:00:00 2001
From: Sam Judd <judds@google.com>
Date: Sun, 24 Jul 2022 12:07:11 -0700
Subject: [PATCH] Target API 32, update tests to use java 11.

---
 benchmark/src/main/AndroidManifest.xml          |  4 +---
 gradle.properties                               | 16 ++++++++--------
 instrumentation/build.gradle                    |  8 ++++----
 instrumentation/src/main/AndroidManifest.xml    | 16 +++++++++++-----
 library/src/main/AndroidManifest.xml            |  3 +--
 library/test/build.gradle                       |  4 ++--
 samples/contacturi/src/main/AndroidManifest.xml |  2 +-
 samples/flickr/src/main/AndroidManifest.xml     |  6 ++++--
 samples/giphy/src/main/AndroidManifest.xml      |  6 ++++--
 samples/imgur/src/main/AndroidManifest.xml      |  4 +++-
 samples/svg/src/main/AndroidManifest.xml        |  4 ++--
 testutil/build.gradle                           |  4 ++--
 12 files changed, 43 insertions(+), 34 deletions(-)

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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  package="com.bumptech.glide.benchmark">
+<manifest package="com.bumptech.glide.benchmark">
   <application />
 </manifest>
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 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.bumptech.glide.instrumentation">
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.bumptech.glide.instrumentation">
+<!--  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />-->
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-  <application>
-    <activity android:name="com.bumptech.glide.test.GlideWithBeforeSuperOnCreateActivity" />
-    <activity android:name="com.bumptech.glide.test.GlideWithAsDifferentSupertypesActivity"  />
+  <application tools:ignore="MissingApplicationIcon">
+    <activity
+        android:name="com.bumptech.glide.test.GlideWithBeforeSuperOnCreateActivity"
+        android:exported="false"/>
+    <activity
+        android:name="com.bumptech.glide.test.GlideWithAsDifferentSupertypesActivity"
+        android:exported="false"
+        />
   </application>
 </manifest>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.bumptech.glide">
+<manifest package="com.bumptech.glide">
   <application/>
 </manifest>
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" >
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
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 @@
 
         <activity
             android:name=".FlickrSearchActivity"
-            android:label="@string/app_name"
+            android:exported="true"
             android:launchMode="singleTask"
             android:windowSoftInputMode="stateHidden|adjustResize">
             <intent-filter>
@@ -29,6 +29,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".FullscreenActivity"/>
+        <activity
+            android:exported="false"
+            android:name=".FullscreenActivity"/>
     </application>
 </manifest>
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">
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name=".FullscreenActivity"/>
+        <activity
+            android:exported="false"
+            android:name=".FullscreenActivity"/>
     </application>
 </manifest>
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">
-    <activity android:name="com.bumptech.glide.samples.imgur.MainActivity">
+    <activity
+        android:exported="true"
+        android:name="com.bumptech.glide.samples.imgur.MainActivity">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
         <category android:name="android.intent.category.LAUNCHER"/>
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">
         <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name">
+            android:exported="true"
+            android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
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
     }
 }