Skip to content

Commit 8875d30

Browse files
TacoTheDankTacoTheDank
committedJun 5, 2022
Clean up and rearrange gradle.properties
·
v5.0.0-rc01compose-alpha6
1 parent 17cae33 commit 8875d30

File tree

16 files changed

+80
-69
lines changed

16 files changed

+80
-69
lines changed
 

‎annotation/compiler/test/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ dependencies {
7272
}
7373
testImplementation "androidx.annotation:annotation:${ANDROID_X_ANNOTATION_VERSION}"
7474
testImplementation "androidx.fragment:fragment:${ANDROID_X_FRAGMENT_VERSION}"
75-
testImplementation "androidx.legacy:legacy-support-v4:${ANDROID_X_VERSION}"
7675
// TODO: this seems excessive, but it works...
7776
testImplementation files(Jvm.current().getJre().homeDir.getAbsolutePath()+'/lib/rt.jar')
7877

‎benchmark/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ android {
3232
}
3333

3434
dependencies {
35-
androidTestImplementation "androidx.test:runner:${ANDROID_X_TEST_VERSION}"
36-
androidTestImplementation "androidx.test.ext:junit:${ANDROID_X_TEST_VERSION}"
35+
androidTestImplementation "androidx.test:runner:${ANDROID_X_TEST_RUNNER_VERSION}"
36+
androidTestImplementation "androidx.test.ext:junit:${ANDROID_X_TEST_JUNIT_VERSION}"
3737
androidTestImplementation "junit:junit:{$JUNIT_VERSION}"
3838

3939
androidTestImplementation project(':library')

‎gradle.properties

+49-33
Original file line numberDiff line numberDiff line change
@@ -10,56 +10,72 @@
1010
# This option should only be used with decoupled projects. More details, visit
1111
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1212
# org.gradle.parallel=true
13-
#Wed Mar 17 09:49:19 PDT 2021
14-
ANDROID_GRADLE_VERSION=4.1.0
15-
ANDROID_SUPPORT_VERSION=27.1.1
16-
ANDROID_X_TEST_VERSION=1.1.0
17-
ANDROID_X_TEST_CORE_VERSION=1.3.0
18-
ANDROID_X_TEST_JUNIT_VERSION=1.1.0
19-
ANDROID_X_FUTURES_VERSION=1.1.0
20-
ANDROID_X_FRAGMENT_VERSION=1.3.1
21-
ANDROID_X_VERSION=1.0.0
13+
#Sun Jun 05 16:53:18 EST 2022
14+
## Grouping
15+
GROUP=com.github.bumptech.glide
16+
17+
## Metadata
18+
POM_DESCRIPTION=A fast and efficient image loading library for Android focused on smooth scrolling.
19+
POM_DEVELOPER_EMAIL=judds@google.com
20+
POM_DEVELOPER_ID=sjudd
21+
POM_DEVELOPER_NAME=Sam Judd
22+
POM_SCM_CONNECTION=scm\:git@github.com\:bumptech/glide.git
23+
POM_SCM_DEV_CONNECTION=scm\:git@github.com\:bumptech/glide.git
24+
POM_SCM_URL=https\://github.com/bumptech/glide
25+
POM_URL=https\://github.com/bumptech/glide
26+
27+
## Gradle config
28+
android.enableJetifier=true
29+
android.useAndroidX=true
30+
org.gradle.configureondemand=false
31+
org.gradle.daemon=true
32+
org.gradle.jvmargs=-Xmx4096M
33+
TEST_JVM_MEMORY_SIZE=4096M
34+
35+
## Glide versioning
36+
VERSION_MAJOR=4
37+
VERSION_MINOR=13
38+
VERSION_PATCH=0
39+
VERSION_NAME=4.13.0
40+
41+
## SDK versioning
42+
COMPILE_SDK_VERSION=29
43+
MIN_SDK_VERSION=14
44+
TARGET_SDK_VERSION=28
45+
46+
## AndroidX versions
2247
ANDROID_X_ANNOTATION_VERSION=1.1.0
48+
ANDROID_X_APPCOMPAT_VERSION=1.0.0
2349
ANDROID_X_BENCHMARK_VERSION=1.0.0
50+
ANDROID_X_CARDVIEW_VERSION=1.0.0
51+
ANDROID_X_CONCURRENT_FUTURES_VERSION=1.1.0
52+
ANDROID_X_CORE_VERSION=1.0.0
53+
ANDROID_X_EXIF_INTERFACE_VERSION=1.2.0
54+
ANDROID_X_FRAGMENT_VERSION=1.3.1
55+
ANDROID_X_RECYCLERVIEW_VERSION=1.0.0
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
2460
ANDROID_X_TRACING_VERSION=1.0.0
61+
ANDROID_X_VECTOR_DRAWABLE_ANIMATED_VERSION=1.0.0
62+
63+
## Other dependency versions
64+
ANDROID_GRADLE_VERSION=4.1.0
2565
AUTO_SERVICE_VERSION=1.0-rc3
26-
COMPILE_SDK_VERSION=29
2766
DAGGER_VERSION=2.15
2867
ERROR_PRONE_PLUGIN_VERSION=0.0.13
2968
ERROR_PRONE_VERSION=2.3.1
30-
EXIF_INTERFACE_VERSION=1.2.0
31-
FINDBUGS_VERSION=3.0.0
32-
GROUP=com.github.bumptech.glide
3369
GUAVA_VERSION=28.1-android
3470
JAVAPOET_VERSION=1.9.0
3571
JSR_305_VERSION=3.0.2
3672
JUNIT_VERSION=4.13.2
37-
MIN_SDK_VERSION=14
3873
MOCKITO_ANDROID_VERSION=2.24.0
3974
MOCKITO_VERSION=2.24.0
4075
MOCKWEBSERVER_VERSION=3.0.0-RC1
4176
OK_HTTP_VERSION=3.10.0
4277
PMD_VERSION=6.0.0
43-
POM_DESCRIPTION=A fast and efficient image loading library for Android focused on smooth scrolling.
44-
POM_DEVELOPER_EMAIL=judds@google.com
45-
POM_DEVELOPER_ID=sjudd
46-
POM_DEVELOPER_NAME=Sam Judd
47-
POM_SCM_CONNECTION=scm\:git@github.com\:bumptech/glide.git
48-
POM_SCM_DEV_CONNECTION=scm\:git@github.com\:bumptech/glide.git
49-
POM_SCM_URL=https\://github.com/bumptech/glide
50-
POM_URL=https\://github.com/bumptech/glide
5178
ROBOLECTRIC_VERSION=4.3.1
52-
TARGET_SDK_VERSION=28
53-
TEST_JVM_MEMORY_SIZE=4096M
5479
TRUTH_VERSION=0.45
55-
VERSION_MAJOR=4
56-
VERSION_MINOR=13
57-
VERSION_NAME=4.13.0
58-
VERSION_PATCH=0
5980
VIOLATIONS_PLUGIN_VERSION=1.8
6081
VOLLEY_VERSION=1.2.0
61-
android.enableJetifier=true
62-
android.useAndroidX=true
63-
org.gradle.configureondemand=false
64-
org.gradle.daemon=true
65-
org.gradle.jvmargs=-Xmx4096M

‎instrumentation/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ dependencies {
1313
androidTestImplementation project(':mocks')
1414
androidTestImplementation project(':testutil')
1515
androidTestImplementation "org.mockito:mockito-android:${MOCKITO_ANDROID_VERSION}"
16-
androidTestImplementation "androidx.test.ext:junit:${ANDROID_X_TEST_VERSION}"
17-
androidTestImplementation "androidx.test:rules:${ANDROID_X_TEST_VERSION}"
16+
androidTestImplementation "androidx.test.ext:junit:${ANDROID_X_TEST_JUNIT_VERSION}"
17+
androidTestImplementation "androidx.test:rules:${ANDROID_X_TEST_RULES_VERSION}"
1818
androidTestImplementation "androidx.test:core:${ANDROID_X_TEST_CORE_VERSION}"
1919
androidTestImplementation "com.google.truth:truth:${TRUTH_VERSION}"
2020
androidTestImplementation "junit:junit:${JUNIT_VERSION}"
21-
androidTestImplementation "androidx.exifinterface:exifinterface:${EXIF_INTERFACE_VERSION}"
21+
androidTestImplementation "androidx.exifinterface:exifinterface:${ANDROID_X_EXIF_INTERFACE_VERSION}"
2222

2323
// Not totally clear why this is required, but it seems to be missing when tests are run on
2424
// 4.1.2 and 4.2.0 emulators.
25-
androidTestImplementation 'com.google.code.findbugs:jsr305:3.0.2'
25+
androidTestImplementation "com.google.code.findbugs:jsr305:${JSR_305_VERSION}"
2626
}
2727

2828
android {

‎integration/concurrent/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ apply plugin: 'com.android.library'
33
dependencies {
44
implementation project(':library')
55
implementation "com.google.guava:guava:${GUAVA_VERSION}"
6-
implementation "androidx.concurrent:concurrent-futures:${ANDROID_X_FUTURES_VERSION}"
6+
implementation "androidx.concurrent:concurrent-futures:${ANDROID_X_CONCURRENT_FUTURES_VERSION}"
77

88
testImplementation project(':mocks')
99
testImplementation project(':testutil')
10-
testImplementation "androidx.legacy:legacy-support-v4:${ANDROID_X_VERSION}"
1110
testImplementation "androidx.test:core:${ANDROID_X_TEST_CORE_VERSION}"
1211
testImplementation "com.google.truth:truth:${TRUTH_VERSION}"
1312
testImplementation "junit:junit:${JUNIT_VERSION}"

‎integration/gifencoder/build.gradle

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ dependencies {
88
testImplementation "junit:junit:${JUNIT_VERSION}"
99
testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}"
1010
testImplementation "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}"
11-
testImplementation "androidx.legacy:legacy-support-v4:${ANDROID_X_VERSION}"
12-
testImplementation "androidx.test:core:${ANDROID_X_TEST_VERSION}"
11+
testImplementation "androidx.test:core:${ANDROID_X_TEST_CORE_VERSION}"
1312
testImplementation "androidx.test.ext:junit:${ANDROID_X_TEST_JUNIT_VERSION}"
14-
testImplementation "androidx.test:runner:${ANDROID_X_TEST_VERSION}"
13+
testImplementation "androidx.test:runner:${ANDROID_X_TEST_RUNNER_VERSION}"
1514
}
1615

1716
android {

‎integration/recyclerview/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
22

33
dependencies {
44
implementation project(':library')
5-
compileOnly "androidx.recyclerview:recyclerview:${ANDROID_X_VERSION}"
5+
compileOnly "androidx.recyclerview:recyclerview:${ANDROID_X_RECYCLERVIEW_VERSION}"
66
compileOnly "androidx.fragment:fragment:${ANDROID_X_FRAGMENT_VERSION}"
77
}
88

‎integration/volley/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ dependencies {
1212
testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}"
1313
testImplementation "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}"
1414
testImplementation "com.squareup.okhttp3:mockwebserver:${MOCKWEBSERVER_VERSION}"
15-
testImplementation "androidx.test:core:${ANDROID_X_TEST_VERSION}"
15+
testImplementation "androidx.test:core:${ANDROID_X_TEST_CORE_VERSION}"
1616
testImplementation "androidx.test.ext:junit:${ANDROID_X_TEST_JUNIT_VERSION}"
17-
testImplementation "androidx.test:runner:${ANDROID_X_TEST_VERSION}"
17+
testImplementation "androidx.test:runner:${ANDROID_X_TEST_RUNNER_VERSION}"
1818
}
1919

2020
android {

‎library/build.gradle

+6-7
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,26 @@ dependencies {
1313
api project(':third_party:disklrucache')
1414
api project(':annotation')
1515
api "androidx.fragment:fragment:${ANDROID_X_FRAGMENT_VERSION}"
16-
api "androidx.vectordrawable:vectordrawable-animated:${ANDROID_X_VERSION}"
17-
api "androidx.exifinterface:exifinterface:${EXIF_INTERFACE_VERSION}"
16+
api "androidx.vectordrawable:vectordrawable-animated:${ANDROID_X_VECTOR_DRAWABLE_ANIMATED_VERSION}"
17+
api "androidx.exifinterface:exifinterface:${ANDROID_X_EXIF_INTERFACE_VERSION}"
1818
api "androidx.tracing:tracing:${ANDROID_X_TRACING_VERSION}"
19-
compileOnly "androidx.appcompat:appcompat:${ANDROID_X_VERSION}"
19+
compileOnly "androidx.appcompat:appcompat:${ANDROID_X_APPCOMPAT_VERSION}"
2020

2121
if (project.plugins.hasPlugin('net.ltgt.errorprone')) {
2222
errorprone "com.google.errorprone:error_prone_core:${ERROR_PRONE_VERSION}"
2323
}
2424

25-
testImplementation "androidx.appcompat:appcompat:${ANDROID_X_VERSION}"
25+
testImplementation "androidx.appcompat:appcompat:${ANDROID_X_APPCOMPAT_VERSION}"
2626
testImplementation project(':testutil')
2727
testImplementation 'com.google.guava:guava-testlib:18.0'
2828
testImplementation "com.google.truth:truth:${TRUTH_VERSION}"
2929
testImplementation "junit:junit:${JUNIT_VERSION}"
3030
testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}"
3131
testImplementation "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}"
3232
testImplementation "com.squareup.okhttp3:mockwebserver:${MOCKWEBSERVER_VERSION}"
33-
testImplementation "androidx.legacy:legacy-support-v4:${ANDROID_X_VERSION}"
34-
testImplementation "androidx.test:core:${ANDROID_X_TEST_VERSION}"
33+
testImplementation "androidx.test:core:${ANDROID_X_TEST_CORE_VERSION}"
3534
testImplementation "androidx.test.ext:junit:${ANDROID_X_TEST_JUNIT_VERSION}"
36-
testImplementation "androidx.test:runner:${ANDROID_X_TEST_VERSION}"
35+
testImplementation "androidx.test:runner:${ANDROID_X_TEST_RUNNER_VERSION}"
3736
}
3837

3938
android {

‎library/test/build.gradle

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'com.android.library'
22

33
dependencies {
4-
testImplementation "androidx.appcompat:appcompat:${ANDROID_X_VERSION}"
4+
testImplementation "androidx.appcompat:appcompat:${ANDROID_X_APPCOMPAT_VERSION}"
55
testImplementation project(':library')
66
testImplementation project(':mocks')
77
testImplementation project(':testutil')
@@ -11,10 +11,9 @@ dependencies {
1111
testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}"
1212
testImplementation "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}"
1313
testImplementation "com.squareup.okhttp3:mockwebserver:${MOCKWEBSERVER_VERSION}"
14-
testImplementation "androidx.legacy:legacy-support-v4:${ANDROID_X_VERSION}"
15-
testImplementation "androidx.test:core:${ANDROID_X_TEST_VERSION}"
14+
testImplementation "androidx.test:core:${ANDROID_X_TEST_CORE_VERSION}"
1615
testImplementation "androidx.test.ext:junit:${ANDROID_X_TEST_JUNIT_VERSION}"
17-
testImplementation "androidx.test:runner:${ANDROID_X_TEST_VERSION}"}
16+
testImplementation "androidx.test:runner:${ANDROID_X_TEST_RUNNER_VERSION}"}
1817

1918
tasks.withType(JavaCompile) {
2019
options.fork = true

‎samples/contacturi/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22

33
dependencies {
44
implementation project(':library')
5-
implementation "androidx.appcompat:appcompat:${ANDROID_X_VERSION}"
5+
implementation "androidx.appcompat:appcompat:${ANDROID_X_APPCOMPAT_VERSION}"
66
annotationProcessor project(':annotation:compiler')
77
}
88

‎samples/flickr/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ dependencies {
77
}
88
annotationProcessor project(':annotation:compiler')
99

10-
implementation "androidx.appcompat:appcompat:${ANDROID_X_VERSION}"
10+
implementation "androidx.appcompat:appcompat:${ANDROID_X_APPCOMPAT_VERSION}"
1111
implementation "com.android.volley:volley:${VOLLEY_VERSION}"
12-
implementation "androidx.recyclerview:recyclerview:${ANDROID_X_VERSION}"
12+
implementation "androidx.recyclerview:recyclerview:${ANDROID_X_RECYCLERVIEW_VERSION}"
1313
}
1414

1515
android {

‎samples/gallery/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dependencies {
55
implementation(project(':integration:recyclerview')) {
66
transitive = false
77
}
8-
implementation "androidx.recyclerview:recyclerview:${ANDROID_X_VERSION}"
8+
implementation "androidx.recyclerview:recyclerview:${ANDROID_X_RECYCLERVIEW_VERSION}"
99
implementation "androidx.fragment:fragment:${ANDROID_X_FRAGMENT_VERSION}"
1010
annotationProcessor project(':annotation:compiler')
1111
}

‎samples/giphy/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies {
66
transitive = false
77
}
88
implementation 'com.google.code.gson:gson:2.8.2'
9-
implementation "androidx.recyclerview:recyclerview:${ANDROID_X_VERSION}"
9+
implementation "androidx.recyclerview:recyclerview:${ANDROID_X_RECYCLERVIEW_VERSION}"
1010
implementation "androidx.fragment:fragment:${ANDROID_X_FRAGMENT_VERSION}"
1111
annotationProcessor project(':annotation:compiler')
1212
}

‎samples/imgur/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ dependencies {
4444
implementation 'io.reactivex:rxandroid:1.2.1'
4545
implementation 'io.reactivex:rxjava:1.3.4'
4646

47-
implementation "androidx.appcompat:appcompat:${ANDROID_X_VERSION}"
48-
implementation "androidx.cardview:cardview:${ANDROID_X_VERSION}"
49-
implementation "androidx.recyclerview:recyclerview:${ANDROID_X_VERSION}"
47+
implementation "androidx.appcompat:appcompat:${ANDROID_X_APPCOMPAT_VERSION}"
48+
implementation "androidx.cardview:cardview:${ANDROID_X_CARDVIEW_VERSION}"
49+
implementation "androidx.recyclerview:recyclerview:${ANDROID_X_RECYCLERVIEW_VERSION}"
5050

5151
// Fixes a compilation warning related to dagger, see
5252
// https://github.com/google/guava/issues/2721.

‎testutil/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ dependencies {
44
implementation "com.google.truth:truth:${TRUTH_VERSION}"
55
implementation project(":library")
66
api "androidx.annotation:annotation:${ANDROID_X_ANNOTATION_VERSION}"
7-
api "androidx.core:core:${ANDROID_X_VERSION}"
8-
api "androidx.test:core:${ANDROID_X_TEST_VERSION}"
7+
api "androidx.core:core:${ANDROID_X_CORE_VERSION}"
8+
api "androidx.test:core:${ANDROID_X_TEST_CORE_VERSION}"
99
}
1010

1111
android {

0 commit comments

Comments
 (0)
Please sign in to comment.