Skip to content

Commit 27a8484

Browse files
sjuddsjudd
committed
Update Glide to java 8, AGP to 8.1.0
1 parent 06fc8f6 commit 27a8484

File tree

30 files changed

+151
-173
lines changed

30 files changed

+151
-173
lines changed

‎.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Build and run unit tests with Gradle
1919
run: ./scripts/ci_unit.sh
2020
- name: Build javadocs
21-
run: ./gradlew dokkaHtmlMultiModule
21+
run: ./gradlew :dokkaHtmlMultiModule
2222
- name: Publish a source snapshot to Sonatype
2323
env:
2424
NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}

‎annotation/compiler/build.gradle

+8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@ import proguard.gradle.ProGuardTask
22

33
apply plugin: 'java'
44

5+
// This package is stuck at java 7 for as long as we use jarjar.
6+
// We should re-evaluate whether we need to continue to worry
7+
// about this.
8+
java {
9+
sourceCompatibility JavaVersion.VERSION_1_7
10+
targetCompatibility JavaVersion.VERSION_1_7
11+
}
12+
513
configurations {
614
// adapted from https://android.googlesource.com/platform/frameworks/testing/+/976c423/espresso/espresso-lib/build.gradle
715
// compileOnly dependencies will be repackaged, see rules in jarjar ant task below

‎annotation/compiler/test/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ android {
3737
}
3838

3939
compileOptions {
40-
sourceCompatibility JavaVersion.VERSION_1_7
41-
targetCompatibility JavaVersion.VERSION_1_7
40+
sourceCompatibility JavaVersion.VERSION_1_8
41+
targetCompatibility JavaVersion.VERSION_1_8
4242
}
4343

4444
testOptions {

‎benchmark/build.gradle

+4-5
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ plugins {
55

66
android {
77
namespace 'com.bumptech.glide.benchmark'
8-
compileSdkVersion libs.versions.compile.sdk.version.get()
9-
10-
buildToolsVersion "30.0.3"
8+
compileSdkVersion 34
9+
buildToolsVersion "34.0.0"
1110

1211
compileOptions {
13-
sourceCompatibility = 1.8
14-
targetCompatibility = 1.8
12+
sourceCompatibility = JavaVersion.VERSION_1_8
13+
targetCompatibility = JavaVersion.VERSION_1_8
1514
}
1615

1716
defaultConfig {

‎build.gradle

-9
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,6 @@ subprojects { project ->
7272
gradlePluginPortal()
7373
}
7474

75-
afterEvaluate {
76-
if (!project.plugins.hasPlugin("org.jetbrains.kotlin.jvm")) {
77-
tasks.withType(JavaCompile) {
78-
sourceCompatibility = 1.7
79-
targetCompatibility = 1.7
80-
}
81-
}
82-
}
83-
8475
// Exclude packages not intended for public use.
8576
if ([
8677
"testutil",

‎glide/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ jar {
151151

152152
artifacts {
153153
archives releaseJavadocJar {
154-
classifier 'javadoc'
154+
archiveClassifier = 'javadoc'
155155
}
156156
}
157157

‎gradle.properties

-7
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,6 @@
1212
# org.gradle.parallel=true
1313
#Sun Jun 05 16:53:18 EST 2022
1414

15-
16-
# upload.gradle manually generates the artifacts for each library, we don't appear to use
17-
# these automatically generated components anyway. We may however be able to use the Android
18-
# DSL to simplify our logic in the future though:
19-
# https://developer.android.com/studio/publish-library/configure-pub-variants
20-
android.disableAutomaticComponentCreation=true
21-
2215
## Grouping
2316
GROUP=com.github.bumptech.glide
2417

‎gradle/wrapper/gradle-wrapper.jar

50 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

‎gradlew.bat

+92-92
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,92 @@
1-
@rem
2-
@rem Copyright 2015 the original author or authors.
3-
@rem
4-
@rem Licensed under the Apache License, Version 2.0 (the "License");
5-
@rem you may not use this file except in compliance with the License.
6-
@rem You may obtain a copy of the License at
7-
@rem
8-
@rem https://www.apache.org/licenses/LICENSE-2.0
9-
@rem
10-
@rem Unless required by applicable law or agreed to in writing, software
11-
@rem distributed under the License is distributed on an "AS IS" BASIS,
12-
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
@rem See the License for the specific language governing permissions and
14-
@rem limitations under the License.
15-
@rem
16-
17-
@if "%DEBUG%"=="" @echo off
18-
@rem ##########################################################################
19-
@rem
20-
@rem Gradle startup script for Windows
21-
@rem
22-
@rem ##########################################################################
23-
24-
@rem Set local scope for the variables with windows NT shell
25-
if "%OS%"=="Windows_NT" setlocal
26-
27-
set DIRNAME=%~dp0
28-
if "%DIRNAME%"=="" set DIRNAME=.
29-
@rem This is normally unused
30-
set APP_BASE_NAME=%~n0
31-
set APP_HOME=%DIRNAME%
32-
33-
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
34-
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
35-
36-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
37-
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
38-
39-
@rem Find java.exe
40-
if defined JAVA_HOME goto findJavaFromJavaHome
41-
42-
set JAVA_EXE=java.exe
43-
%JAVA_EXE% -version >NUL 2>&1
44-
if %ERRORLEVEL% equ 0 goto execute
45-
46-
echo.
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48-
echo.
49-
echo Please set the JAVA_HOME variable in your environment to match the
50-
echo location of your Java installation.
51-
52-
goto fail
53-
54-
:findJavaFromJavaHome
55-
set JAVA_HOME=%JAVA_HOME:"=%
56-
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
57-
58-
if exist "%JAVA_EXE%" goto execute
59-
60-
echo.
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62-
echo.
63-
echo Please set the JAVA_HOME variable in your environment to match the
64-
echo location of your Java installation.
65-
66-
goto fail
67-
68-
:execute
69-
@rem Setup the command line
70-
71-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
72-
73-
74-
@rem Execute Gradle
75-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
76-
77-
:end
78-
@rem End local scope for the variables with windows NT shell
79-
if %ERRORLEVEL% equ 0 goto mainEnd
80-
81-
:fail
82-
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
83-
rem the _cmd.exe /c_ return code!
84-
set EXIT_CODE=%ERRORLEVEL%
85-
if %EXIT_CODE% equ 0 set EXIT_CODE=1
86-
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
87-
exit /b %EXIT_CODE%
88-
89-
:mainEnd
90-
if "%OS%"=="Windows_NT" endlocal
91-
92-
:omega
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
17+
@if "%DEBUG%"=="" @echo off
18+
@rem ##########################################################################
19+
@rem
20+
@rem Gradle startup script for Windows
21+
@rem
22+
@rem ##########################################################################
23+
24+
@rem Set local scope for the variables with windows NT shell
25+
if "%OS%"=="Windows_NT" setlocal
26+
27+
set DIRNAME=%~dp0
28+
if "%DIRNAME%"=="" set DIRNAME=.
29+
@rem This is normally unused
30+
set APP_BASE_NAME=%~n0
31+
set APP_HOME=%DIRNAME%
32+
33+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
34+
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
35+
36+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
37+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
38+
39+
@rem Find java.exe
40+
if defined JAVA_HOME goto findJavaFromJavaHome
41+
42+
set JAVA_EXE=java.exe
43+
%JAVA_EXE% -version >NUL 2>&1
44+
if %ERRORLEVEL% equ 0 goto execute
45+
46+
echo.
47+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48+
echo.
49+
echo Please set the JAVA_HOME variable in your environment to match the
50+
echo location of your Java installation.
51+
52+
goto fail
53+
54+
:findJavaFromJavaHome
55+
set JAVA_HOME=%JAVA_HOME:"=%
56+
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
57+
58+
if exist "%JAVA_EXE%" goto execute
59+
60+
echo.
61+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62+
echo.
63+
echo Please set the JAVA_HOME variable in your environment to match the
64+
echo location of your Java installation.
65+
66+
goto fail
67+
68+
:execute
69+
@rem Setup the command line
70+
71+
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
72+
73+
74+
@rem Execute Gradle
75+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
76+
77+
:end
78+
@rem End local scope for the variables with windows NT shell
79+
if %ERRORLEVEL% equ 0 goto mainEnd
80+
81+
:fail
82+
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
83+
rem the _cmd.exe /c_ return code!
84+
set EXIT_CODE=%ERRORLEVEL%
85+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
86+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
87+
exit /b %EXIT_CODE%
88+
89+
:mainEnd
90+
if "%OS%"=="Windows_NT" endlocal
91+
92+
:omega

‎integration/avif/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ android {
2020
}
2121

2222
compileOptions {
23-
sourceCompatibility JavaVersion.VERSION_1_7
24-
targetCompatibility JavaVersion.VERSION_1_7
23+
sourceCompatibility JavaVersion.VERSION_1_8
24+
targetCompatibility JavaVersion.VERSION_1_8
2525
}
2626
}
2727

‎integration/concurrent/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ android {
2525
}
2626

2727
compileOptions {
28-
sourceCompatibility JavaVersion.VERSION_1_7
29-
targetCompatibility JavaVersion.VERSION_1_7
28+
sourceCompatibility JavaVersion.VERSION_1_8
29+
targetCompatibility JavaVersion.VERSION_1_8
3030
}
3131
}
3232

‎integration/cronet/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ android {
2727
}
2828

2929
compileOptions {
30-
sourceCompatibility JavaVersion.VERSION_1_7
31-
targetCompatibility JavaVersion.VERSION_1_7
30+
sourceCompatibility JavaVersion.VERSION_1_8
31+
targetCompatibility JavaVersion.VERSION_1_8
3232
}
3333
}
3434

‎integration/gifencoder/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ android {
3131
}
3232

3333
compileOptions {
34-
sourceCompatibility JavaVersion.VERSION_1_7
35-
targetCompatibility JavaVersion.VERSION_1_7
34+
sourceCompatibility JavaVersion.VERSION_1_8
35+
targetCompatibility JavaVersion.VERSION_1_8
3636
}
3737
}
3838

‎integration/okhttp/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ android {
2020
}
2121

2222
compileOptions {
23-
sourceCompatibility JavaVersion.VERSION_1_7
24-
targetCompatibility JavaVersion.VERSION_1_7
23+
sourceCompatibility JavaVersion.VERSION_1_8
24+
targetCompatibility JavaVersion.VERSION_1_8
2525
}
2626
}
2727

‎integration/okhttp3/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ android {
2020
}
2121

2222
compileOptions {
23-
sourceCompatibility JavaVersion.VERSION_1_7
24-
targetCompatibility JavaVersion.VERSION_1_7
23+
sourceCompatibility JavaVersion.VERSION_1_8
24+
targetCompatibility JavaVersion.VERSION_1_8
2525
}
2626
}
2727

‎integration/recyclerview/build.gradle

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

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

‎integration/volley/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ android {
2929
}
3030

3131
compileOptions {
32-
sourceCompatibility JavaVersion.VERSION_1_7
33-
targetCompatibility JavaVersion.VERSION_1_7
32+
sourceCompatibility JavaVersion.VERSION_1_8
33+
targetCompatibility JavaVersion.VERSION_1_8
3434
}
3535
}
3636

‎library/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ android {
7070
}
7171

7272
compileOptions {
73-
sourceCompatibility JavaVersion.VERSION_1_7
74-
targetCompatibility JavaVersion.VERSION_1_7
73+
sourceCompatibility JavaVersion.VERSION_1_8
74+
targetCompatibility JavaVersion.VERSION_1_8
7575
}
7676
}
7777

‎library/test/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ afterEvaluate {
2929
android.testOptions.unitTests.all { Test testTask ->
3030
// configure max heap size of the test JVM
3131
testTask.maxHeapSize = TEST_JVM_MEMORY_SIZE as String
32-
if (JavaVersion.current() <= JavaVersion.VERSION_1_7) {
32+
if (JavaVersion.current() <= JavaVersion.VERSION_1_8) {
3333
// Java HotSpot(TM) 64-Bit Server VM warning: ignoring option MaxPermSize=2048m; support was removed in 8.0
3434
testTask.jvmArgs "-XX:MaxPermSize=${TEST_JVM_MEMORY_SIZE}"
3535
}

0 commit comments

Comments
 (0)