Skip to content

Commit 839899d

Browse files
sjuddsjudd
committed
Target API 32, update tests to use java 11.
1 parent 6f681a2 commit 839899d

File tree

12 files changed

+43
-34
lines changed

12 files changed

+43
-34
lines changed

‎benchmark/src/main/AndroidManifest.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="com.bumptech.glide.benchmark">
2+
<manifest package="com.bumptech.glide.benchmark">
53
<application />
64
</manifest>

‎gradle.properties

+8-8
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ TEST_JVM_MEMORY_SIZE=4096M
3434

3535
## Glide versioning
3636
VERSION_MAJOR=4
37-
VERSION_MINOR=14
37+
VERSION_MINOR=16
3838
VERSION_PATCH=0
3939
VERSION_NAME=4.14.0-SNAPSHOT
4040

4141
## SDK versioning
42-
COMPILE_SDK_VERSION=29
42+
COMPILE_SDK_VERSION=32
4343
MIN_SDK_VERSION=14
44-
TARGET_SDK_VERSION=28
44+
TARGET_SDK_VERSION=32
4545

4646
## AndroidX versions
4747
ANDROID_X_ANNOTATION_VERSION=1.3.0
@@ -53,10 +53,10 @@ ANDROID_X_CORE_VERSION=1.6.0
5353
ANDROID_X_EXIF_INTERFACE_VERSION=1.3.3
5454
ANDROID_X_FRAGMENT_VERSION=1.3.6
5555
ANDROID_X_RECYCLERVIEW_VERSION=1.2.1
56-
ANDROID_X_TEST_CORE_VERSION=1.3.0
57-
ANDROID_X_TEST_JUNIT_VERSION=1.1.0
58-
ANDROID_X_TEST_RULES_VERSION=1.1.0
59-
ANDROID_X_TEST_RUNNER_VERSION=1.1.0
56+
ANDROID_X_TEST_CORE_VERSION=1.4.0
57+
ANDROID_X_TEST_JUNIT_VERSION=1.1.3
58+
ANDROID_X_TEST_RULES_VERSION=1.4.0
59+
ANDROID_X_TEST_RUNNER_VERSION=1.4.0
6060
ANDROID_X_TRACING_VERSION=1.0.0
6161
ANDROID_X_VECTOR_DRAWABLE_ANIMATED_VERSION=1.1.0
6262
ANDROID_X_CORE_KTX_VERSION=1.8.0
@@ -85,7 +85,7 @@ MOCKITO_VERSION=2.24.0
8585
MOCKWEBSERVER_VERSION=3.0.0-RC1
8686
OK_HTTP_VERSION=3.10.0
8787
PMD_VERSION=6.0.0
88-
ROBOLECTRIC_VERSION=4.3.1
88+
ROBOLECTRIC_VERSION=4.8.1
8989
TRUTH_VERSION=0.45
9090
VIOLATIONS_PLUGIN_VERSION=1.8
9191
VOLLEY_VERSION=1.2.0

‎instrumentation/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@ dependencies {
2626
}
2727

2828
android {
29-
compileSdk COMPILE_SDK_VERSION as int
29+
compileSdk 30 as int
3030

3131
defaultConfig {
3232
applicationId 'com.bumptech.glide.instrumentation'
33-
minSdk 16 as int
33+
minSdk MIN_SDK_VERSION as int
3434
targetSdk TARGET_SDK_VERSION as int
3535
versionCode 1
3636
versionName '1.0'
3737
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3838
}
3939

4040
compileOptions {
41-
sourceCompatibility JavaVersion.VERSION_1_7
42-
targetCompatibility JavaVersion.VERSION_1_7
41+
sourceCompatibility JavaVersion.VERSION_11
42+
targetCompatibility JavaVersion.VERSION_11
4343
}
4444
}
4545

‎instrumentation/src/main/AndroidManifest.xml

+11-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.bumptech.glide.instrumentation">
3-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
2+
xmlns:tools="http://schemas.android.com/tools"
3+
package="com.bumptech.glide.instrumentation">
4+
<!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />-->
45
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
5-
<application>
6-
<activity android:name="com.bumptech.glide.test.GlideWithBeforeSuperOnCreateActivity" />
7-
<activity android:name="com.bumptech.glide.test.GlideWithAsDifferentSupertypesActivity" />
6+
<application tools:ignore="MissingApplicationIcon">
7+
<activity
8+
android:name="com.bumptech.glide.test.GlideWithBeforeSuperOnCreateActivity"
9+
android:exported="false"/>
10+
<activity
11+
android:name="com.bumptech.glide.test.GlideWithAsDifferentSupertypesActivity"
12+
android:exported="false"
13+
/>
814
</application>
915
</manifest>

‎library/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.bumptech.glide">
2+
<manifest package="com.bumptech.glide">
43
<application/>
54
</manifest>

‎library/test/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ android {
4747
}
4848

4949
compileOptions {
50-
sourceCompatibility JavaVersion.VERSION_1_7
51-
targetCompatibility JavaVersion.VERSION_1_7
50+
sourceCompatibility JavaVersion.VERSION_11
51+
targetCompatibility JavaVersion.VERSION_11
5252
}
5353

5454
testOptions.unitTests.includeAndroidResources = true

‎samples/contacturi/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
android:theme="@style/Theme.AppCompat" >
1212
<activity
1313
android:name=".MainActivity"
14-
android:label="@string/app_name">
14+
android:exported="true">
1515
<intent-filter>
1616
<action android:name="android.intent.action.MAIN"/>
1717
<category android:name="android.intent.category.LAUNCHER"/>

‎samples/flickr/src/main/AndroidManifest.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<activity
2222
android:name=".FlickrSearchActivity"
23-
android:label="@string/app_name"
23+
android:exported="true"
2424
android:launchMode="singleTask"
2525
android:windowSoftInputMode="stateHidden|adjustResize">
2626
<intent-filter>
@@ -29,6 +29,8 @@
2929
</intent-filter>
3030
</activity>
3131

32-
<activity android:name=".FullscreenActivity"/>
32+
<activity
33+
android:exported="false"
34+
android:name=".FullscreenActivity"/>
3335
</application>
3436
</manifest>

‎samples/giphy/src/main/AndroidManifest.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@
1717
android:theme="@style/AppTheme">
1818
<activity
1919
android:name=".MainActivity"
20-
android:label="@string/app_name">
20+
android:exported="true">
2121
<intent-filter>
2222
<action android:name="android.intent.action.MAIN"/>
2323

2424
<category android:name="android.intent.category.LAUNCHER"/>
2525
</intent-filter>
2626
</activity>
27-
<activity android:name=".FullscreenActivity"/>
27+
<activity
28+
android:exported="false"
29+
android:name=".FullscreenActivity"/>
2830
</application>
2931
</manifest>

‎samples/imgur/src/main/AndroidManifest.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
android:networkSecurityConfig="@xml/network_security_config"
1919
android:name="com.bumptech.glide.samples.imgur.ImgurApplication"
2020
tools:targetApi="n">
21-
<activity android:name="com.bumptech.glide.samples.imgur.MainActivity">
21+
<activity
22+
android:exported="true"
23+
android:name="com.bumptech.glide.samples.imgur.MainActivity">
2224
<intent-filter>
2325
<action android:name="android.intent.action.MAIN"/>
2426
<category android:name="android.intent.category.LAUNCHER"/>

‎samples/svg/src/main/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
android:icon="@android:drawable/sym_def_app_icon"
1010
android:label="@string/app_name">
1111
<activity
12-
android:name=".MainActivity"
13-
android:label="@string/app_name">
12+
android:exported="true"
13+
android:name=".MainActivity">
1414
<intent-filter>
1515
<action android:name="android.intent.action.MAIN"/>
1616
<category android:name="android.intent.category.LAUNCHER"/>

‎testutil/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ android {
1818
}
1919

2020
compileOptions {
21-
sourceCompatibility JavaVersion.VERSION_1_7
22-
targetCompatibility JavaVersion.VERSION_1_7
21+
sourceCompatibility JavaVersion.VERSION_11
22+
targetCompatibility JavaVersion.VERSION_11
2323
}
2424
}

0 commit comments

Comments
 (0)