Skip to content

Commit

Permalink
Merge pull request #4845 from sjudd:target_32_java_11
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 464841931
  • Loading branch information
glide-copybara-robot committed Aug 2, 2022
2 parents 6f681a2 + 839899d commit 813ebd6
Show file tree
Hide file tree
Showing 12 changed files with 41 additions and 32 deletions.
4 changes: 1 addition & 3 deletions benchmark/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -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>
14 changes: 7 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ 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
Expand All @@ -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
Expand Down Expand Up @@ -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
8 changes: 4 additions & 4 deletions instrumentation/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,20 @@ 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'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
}

14 changes: 10 additions & 4 deletions instrumentation/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.bumptech.glide.instrumentation">
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>
3 changes: 1 addition & 2 deletions library/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions library/test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion samples/contacturi/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
6 changes: 4 additions & 2 deletions samples/flickr/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -29,6 +29,8 @@
</intent-filter>
</activity>

<activity android:name=".FullscreenActivity"/>
<activity
android:exported="false"
android:name=".FullscreenActivity"/>
</application>
</manifest>
6 changes: 4 additions & 2 deletions samples/giphy/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 3 additions & 1 deletion samples/imgur/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
4 changes: 2 additions & 2 deletions samples/svg/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
4 changes: 2 additions & 2 deletions testutil/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
}

0 comments on commit 813ebd6

Please sign in to comment.