Merge pull request #4813 from TacoTheDank:fixVersioning

PiperOrigin-RevId: 456503369
bumptech · Jun 22, 2022 · fd5e7df · fd5e7df
2 parents 340d57b + 1f73006
commit fd5e7df
Show file tree

Hide file tree

Showing 17 changed files with 84 additions and 77 deletions.
diff --git a/annotation/compiler/test/build.gradle b/annotation/compiler/test/build.gradle
@@ -72,7 +72,6 @@ dependencies {
     }
     testImplementation "androidx.annotation:annotation:${ANDROID_X_ANNOTATION_VERSION}"
     testImplementation "androidx.fragment:fragment:${ANDROID_X_FRAGMENT_VERSION}"
-    testImplementation "androidx.legacy:legacy-support-v4:${ANDROID_X_VERSION}"
     // TODO: this seems excessive, but it works...
     testImplementation files(Jvm.current().getJre().homeDir.getAbsolutePath()+'/lib/rt.jar')
 

diff --git a/benchmark/build.gradle b/benchmark/build.gradle
@@ -32,8 +32,8 @@ android {
 }
 
 dependencies {
-    androidTestImplementation "androidx.test:runner:${ANDROID_X_TEST_VERSION}"
-    androidTestImplementation "androidx.test.ext:junit:${ANDROID_X_TEST_VERSION}"
+    androidTestImplementation "androidx.test:runner:${ANDROID_X_TEST_RUNNER_VERSION}"
+    androidTestImplementation "androidx.test.ext:junit:${ANDROID_X_TEST_JUNIT_VERSION}"
     androidTestImplementation "junit:junit:{$JUNIT_VERSION}"
 
     androidTestImplementation project(':library')

diff --git a/gradle.properties b/gradle.properties
@@ -10,56 +10,73 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-#Wed Mar 17 09:49:19 PDT 2021
-ANDROID_GRADLE_VERSION=4.1.0
-ANDROID_SUPPORT_VERSION=27.1.1
-ANDROID_X_TEST_VERSION=1.1.0
-ANDROID_X_TEST_CORE_VERSION=1.3.0
-ANDROID_X_TEST_JUNIT_VERSION=1.1.0
-ANDROID_X_FUTURES_VERSION=1.1.0
-ANDROID_X_FRAGMENT_VERSION=1.3.1
-ANDROID_X_VERSION=1.0.0
+#Sun Jun 05 16:53:18 EST 2022
+## Grouping
+GROUP=com.github.bumptech.glide
+
+## Metadata
+POM_DESCRIPTION=A fast and efficient image loading library for Android focused on smooth scrolling.
+POM_DEVELOPER_EMAIL=judds@google.com
+POM_DEVELOPER_ID=sjudd
+POM_DEVELOPER_NAME=Sam Judd
+POM_SCM_CONNECTION=scm\:git@github.com\:bumptech/glide.git
+POM_SCM_DEV_CONNECTION=scm\:git@github.com\:bumptech/glide.git
+POM_SCM_URL=https\://github.com/bumptech/glide
+POM_URL=https\://github.com/bumptech/glide
+
+## Gradle config
+android.enableJetifier=true
+android.useAndroidX=true
+org.gradle.configureondemand=false
+org.gradle.daemon=true
+org.gradle.jvmargs=-Xmx4096M
+TEST_JVM_MEMORY_SIZE=4096M
+
+## Glide versioning
+VERSION_MAJOR=4
+VERSION_MINOR=14
+VERSION_PATCH=0
+VERSION_NAME=4.14.0-SNAPSHOT
+
+## SDK versioning
+COMPILE_SDK_VERSION=29
+MIN_SDK_VERSION=14
+TARGET_SDK_VERSION=28
+
+## AndroidX versions
 ANDROID_X_ANNOTATION_VERSION=1.1.0
+ANDROID_X_APPCOMPAT_VERSION=1.0.0
 ANDROID_X_BENCHMARK_VERSION=1.0.0
+ANDROID_X_CARDVIEW_VERSION=1.0.0
+ANDROID_X_CONCURRENT_FUTURES_VERSION=1.1.0
+ANDROID_X_CORE_VERSION=1.0.0
+ANDROID_X_EXIF_INTERFACE_VERSION=1.2.0
+ANDROID_X_FRAGMENT_VERSION=1.3.1
+ANDROID_X_RECYCLERVIEW_VERSION=1.0.0
+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_TRACING_VERSION=1.0.0
+ANDROID_X_VECTOR_DRAWABLE_ANIMATED_VERSION=1.0.0
+
+## Other dependency versions
+ANDROID_GRADLE_VERSION=4.1.0
 AUTO_SERVICE_VERSION=1.0-rc3
-COMPILE_SDK_VERSION=29
 DAGGER_VERSION=2.15
 ERROR_PRONE_PLUGIN_VERSION=0.0.13
 ERROR_PRONE_VERSION=2.3.1
-EXIF_INTERFACE_VERSION=1.2.0
-FINDBUGS_VERSION=3.0.0
-GROUP=com.github.bumptech.glide
+GUAVA_TESTLIB_VERSION=18.0
 GUAVA_VERSION=28.1-android
 JAVAPOET_VERSION=1.9.0
 JSR_305_VERSION=3.0.2
 JUNIT_VERSION=4.13.2
-MIN_SDK_VERSION=14
 MOCKITO_ANDROID_VERSION=2.24.0
 MOCKITO_VERSION=2.24.0
 MOCKWEBSERVER_VERSION=3.0.0-RC1
 OK_HTTP_VERSION=3.10.0
 PMD_VERSION=6.0.0
-POM_DESCRIPTION=A fast and efficient image loading library for Android focused on smooth scrolling.
-POM_DEVELOPER_EMAIL=judds@google.com
-POM_DEVELOPER_ID=sjudd
-POM_DEVELOPER_NAME=Sam Judd
-POM_SCM_CONNECTION=scm\:git@github.com\:bumptech/glide.git
-POM_SCM_DEV_CONNECTION=scm\:git@github.com\:bumptech/glide.git
-POM_SCM_URL=https\://github.com/bumptech/glide
-POM_URL=https\://github.com/bumptech/glide
 ROBOLECTRIC_VERSION=4.3.1
-TARGET_SDK_VERSION=28
-TEST_JVM_MEMORY_SIZE=4096M
 TRUTH_VERSION=0.45
-VERSION_MAJOR=4
-VERSION_MINOR=14
-VERSION_NAME=4.14.0-SNAPSHOT
-VERSION_PATCH=0
 VIOLATIONS_PLUGIN_VERSION=1.8
 VOLLEY_VERSION=1.2.0
-android.enableJetifier=true
-android.useAndroidX=true
-org.gradle.configureondemand=false
-org.gradle.daemon=true
-org.gradle.jvmargs=-Xmx4096M
diff --git a/instrumentation/build.gradle b/instrumentation/build.gradle
@@ -13,16 +13,16 @@ dependencies {
     androidTestImplementation project(':mocks')
     androidTestImplementation project(':testutil')
     androidTestImplementation "org.mockito:mockito-android:${MOCKITO_ANDROID_VERSION}"
-    androidTestImplementation "androidx.test.ext:junit:${ANDROID_X_TEST_VERSION}"
-    androidTestImplementation "androidx.test:rules:${ANDROID_X_TEST_VERSION}"
+    androidTestImplementation "androidx.test.ext:junit:${ANDROID_X_TEST_JUNIT_VERSION}"
+    androidTestImplementation "androidx.test:rules:${ANDROID_X_TEST_RULES_VERSION}"
     androidTestImplementation "androidx.test:core:${ANDROID_X_TEST_CORE_VERSION}"
     androidTestImplementation "com.google.truth:truth:${TRUTH_VERSION}"
     androidTestImplementation "junit:junit:${JUNIT_VERSION}"
-    androidTestImplementation "androidx.exifinterface:exifinterface:${EXIF_INTERFACE_VERSION}"
+    androidTestImplementation "androidx.exifinterface:exifinterface:${ANDROID_X_EXIF_INTERFACE_VERSION}"
 
     // Not totally clear why this is required, but it seems to be missing when tests are run on
     // 4.1.2 and 4.2.0 emulators.
-    androidTestImplementation 'com.google.code.findbugs:jsr305:3.0.2'
+    androidTestImplementation "com.google.code.findbugs:jsr305:${JSR_305_VERSION}"
 }
 
 android {

diff --git a/integration/concurrent/build.gradle b/integration/concurrent/build.gradle
@@ -3,11 +3,10 @@ apply plugin: 'com.android.library'
 dependencies {
     implementation project(':library')
     implementation "com.google.guava:guava:${GUAVA_VERSION}"
-    implementation "androidx.concurrent:concurrent-futures:${ANDROID_X_FUTURES_VERSION}"
+    implementation "androidx.concurrent:concurrent-futures:${ANDROID_X_CONCURRENT_FUTURES_VERSION}"
 
     testImplementation project(':mocks')
     testImplementation project(':testutil')
-    testImplementation "androidx.legacy:legacy-support-v4:${ANDROID_X_VERSION}"
     testImplementation "androidx.test:core:${ANDROID_X_TEST_CORE_VERSION}"
     testImplementation "com.google.truth:truth:${TRUTH_VERSION}"
     testImplementation "junit:junit:${JUNIT_VERSION}"

diff --git a/integration/gifencoder/build.gradle b/integration/gifencoder/build.gradle
@@ -8,10 +8,9 @@ dependencies {
     testImplementation "junit:junit:${JUNIT_VERSION}"
     testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}"
     testImplementation "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}"
-    testImplementation "androidx.legacy:legacy-support-v4:${ANDROID_X_VERSION}"
-    testImplementation "androidx.test:core:${ANDROID_X_TEST_VERSION}"
+    testImplementation "androidx.test:core:${ANDROID_X_TEST_CORE_VERSION}"
     testImplementation "androidx.test.ext:junit:${ANDROID_X_TEST_JUNIT_VERSION}"
-    testImplementation "androidx.test:runner:${ANDROID_X_TEST_VERSION}"
+    testImplementation "androidx.test:runner:${ANDROID_X_TEST_RUNNER_VERSION}"
 }
 
 android {

diff --git a/integration/recyclerview/build.gradle b/integration/recyclerview/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 dependencies {
     implementation project(':library')
-    compileOnly "androidx.recyclerview:recyclerview:${ANDROID_X_VERSION}"
+    compileOnly "androidx.recyclerview:recyclerview:${ANDROID_X_RECYCLERVIEW_VERSION}"
     compileOnly "androidx.fragment:fragment:${ANDROID_X_FRAGMENT_VERSION}"
 }
 

diff --git a/integration/volley/build.gradle b/integration/volley/build.gradle
@@ -12,9 +12,9 @@ dependencies {
     testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}"
     testImplementation "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}"
     testImplementation "com.squareup.okhttp3:mockwebserver:${MOCKWEBSERVER_VERSION}"
-    testImplementation "androidx.test:core:${ANDROID_X_TEST_VERSION}"
+    testImplementation "androidx.test:core:${ANDROID_X_TEST_CORE_VERSION}"
     testImplementation "androidx.test.ext:junit:${ANDROID_X_TEST_JUNIT_VERSION}"
-    testImplementation "androidx.test:runner:${ANDROID_X_TEST_VERSION}"
+    testImplementation "androidx.test:runner:${ANDROID_X_TEST_RUNNER_VERSION}"
 }
 
 android {

diff --git a/library/build.gradle b/library/build.gradle
@@ -13,27 +13,26 @@ dependencies {
     api project(':third_party:disklrucache')
     api project(':annotation')
     api "androidx.fragment:fragment:${ANDROID_X_FRAGMENT_VERSION}"
-    api "androidx.vectordrawable:vectordrawable-animated:${ANDROID_X_VERSION}"
-    api "androidx.exifinterface:exifinterface:${EXIF_INTERFACE_VERSION}"
+    api "androidx.vectordrawable:vectordrawable-animated:${ANDROID_X_VECTOR_DRAWABLE_ANIMATED_VERSION}"
+    api "androidx.exifinterface:exifinterface:${ANDROID_X_EXIF_INTERFACE_VERSION}"
     api "androidx.tracing:tracing:${ANDROID_X_TRACING_VERSION}"
-    compileOnly "androidx.appcompat:appcompat:${ANDROID_X_VERSION}"
+    compileOnly "androidx.appcompat:appcompat:${ANDROID_X_APPCOMPAT_VERSION}"
 
     if (project.plugins.hasPlugin('net.ltgt.errorprone')) {
         errorprone "com.google.errorprone:error_prone_core:${ERROR_PRONE_VERSION}"
     }
 
-    testImplementation "androidx.appcompat:appcompat:${ANDROID_X_VERSION}"
+    testImplementation "androidx.appcompat:appcompat:${ANDROID_X_APPCOMPAT_VERSION}"
     testImplementation project(':testutil')
-    testImplementation 'com.google.guava:guava-testlib:18.0'
+    testImplementation "com.google.guava:guava-testlib:${GUAVA_TESTLIB_VERSION}"
     testImplementation "com.google.truth:truth:${TRUTH_VERSION}"
     testImplementation "junit:junit:${JUNIT_VERSION}"
     testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}"
     testImplementation "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}"
     testImplementation "com.squareup.okhttp3:mockwebserver:${MOCKWEBSERVER_VERSION}"
-    testImplementation "androidx.legacy:legacy-support-v4:${ANDROID_X_VERSION}"
-    testImplementation "androidx.test:core:${ANDROID_X_TEST_VERSION}"
+    testImplementation "androidx.test:core:${ANDROID_X_TEST_CORE_VERSION}"
     testImplementation "androidx.test.ext:junit:${ANDROID_X_TEST_JUNIT_VERSION}"
-    testImplementation "androidx.test:runner:${ANDROID_X_TEST_VERSION}"
+    testImplementation "androidx.test:runner:${ANDROID_X_TEST_RUNNER_VERSION}"
 }
 
 android {

diff --git a/library/test/build.gradle b/library/test/build.gradle
@@ -1,20 +1,19 @@
 apply plugin: 'com.android.library'
 
 dependencies {
-    testImplementation "androidx.appcompat:appcompat:${ANDROID_X_VERSION}"
+    testImplementation "androidx.appcompat:appcompat:${ANDROID_X_APPCOMPAT_VERSION}"
     testImplementation project(':library')
     testImplementation project(':mocks')
     testImplementation project(':testutil')
-    testImplementation 'com.google.guava:guava-testlib:18.0'
+    testImplementation "com.google.guava:guava-testlib:${GUAVA_TESTLIB_VERSION}"
     testImplementation "com.google.truth:truth:${TRUTH_VERSION}"
     testImplementation "junit:junit:${JUNIT_VERSION}"
     testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}"
     testImplementation "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}"
     testImplementation "com.squareup.okhttp3:mockwebserver:${MOCKWEBSERVER_VERSION}"
-    testImplementation "androidx.legacy:legacy-support-v4:${ANDROID_X_VERSION}"
-    testImplementation "androidx.test:core:${ANDROID_X_TEST_VERSION}"
+    testImplementation "androidx.test:core:${ANDROID_X_TEST_CORE_VERSION}"
     testImplementation "androidx.test.ext:junit:${ANDROID_X_TEST_JUNIT_VERSION}"
-    testImplementation "androidx.test:runner:${ANDROID_X_TEST_VERSION}"}
+    testImplementation "androidx.test:runner:${ANDROID_X_TEST_RUNNER_VERSION}"}
 
 tasks.withType(JavaCompile) {
     options.fork = true

diff --git a/samples/contacturi/build.gradle b/samples/contacturi/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 dependencies {
     implementation project(':library')
-    implementation "androidx.appcompat:appcompat:${ANDROID_X_VERSION}"
+    implementation "androidx.appcompat:appcompat:${ANDROID_X_APPCOMPAT_VERSION}"
     annotationProcessor project(':annotation:compiler')
 }
 

diff --git a/samples/flickr/build.gradle b/samples/flickr/build.gradle
@@ -7,9 +7,9 @@ dependencies {
     }
     annotationProcessor project(':annotation:compiler')
 
-    implementation "androidx.appcompat:appcompat:${ANDROID_X_VERSION}"
+    implementation "androidx.appcompat:appcompat:${ANDROID_X_APPCOMPAT_VERSION}"
     implementation "com.android.volley:volley:${VOLLEY_VERSION}"
-    implementation "androidx.recyclerview:recyclerview:${ANDROID_X_VERSION}"
+    implementation "androidx.recyclerview:recyclerview:${ANDROID_X_RECYCLERVIEW_VERSION}"
 }
 
 android {

diff --git a/samples/gallery/build.gradle b/samples/gallery/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     implementation(project(':integration:recyclerview')) {
         transitive = false
     }
-    implementation "androidx.recyclerview:recyclerview:${ANDROID_X_VERSION}"
+    implementation "androidx.recyclerview:recyclerview:${ANDROID_X_RECYCLERVIEW_VERSION}"
     implementation "androidx.fragment:fragment:${ANDROID_X_FRAGMENT_VERSION}"
     annotationProcessor project(':annotation:compiler')
 }

diff --git a/samples/giphy/build.gradle b/samples/giphy/build.gradle
@@ -6,7 +6,7 @@ dependencies {
         transitive = false
     }
     implementation 'com.google.code.gson:gson:2.8.2'
-    implementation "androidx.recyclerview:recyclerview:${ANDROID_X_VERSION}"
+    implementation "androidx.recyclerview:recyclerview:${ANDROID_X_RECYCLERVIEW_VERSION}"
     implementation "androidx.fragment:fragment:${ANDROID_X_FRAGMENT_VERSION}"
     annotationProcessor project(':annotation:compiler')
 }

diff --git a/samples/imgur/build.gradle b/samples/imgur/build.gradle
@@ -44,9 +44,9 @@ dependencies {
     implementation 'io.reactivex:rxandroid:1.2.1'
     implementation 'io.reactivex:rxjava:1.3.4'
 
-    implementation "androidx.appcompat:appcompat:${ANDROID_X_VERSION}"
-    implementation "androidx.cardview:cardview:${ANDROID_X_VERSION}"
-    implementation "androidx.recyclerview:recyclerview:${ANDROID_X_VERSION}"
+    implementation "androidx.appcompat:appcompat:${ANDROID_X_APPCOMPAT_VERSION}"
+    implementation "androidx.cardview:cardview:${ANDROID_X_CARDVIEW_VERSION}"
+    implementation "androidx.recyclerview:recyclerview:${ANDROID_X_RECYCLERVIEW_VERSION}"
 
     // Fixes a compilation warning related to dagger, see
     // https://github.com/google/guava/issues/2721.

diff --git a/testutil/build.gradle b/testutil/build.gradle
@@ -4,8 +4,8 @@ dependencies {
     implementation "com.google.truth:truth:${TRUTH_VERSION}"
     implementation project(":library")
     api "androidx.annotation:annotation:${ANDROID_X_ANNOTATION_VERSION}"
-    api "androidx.core:core:${ANDROID_X_VERSION}"
-    api "androidx.test:core:${ANDROID_X_TEST_VERSION}"
+    api "androidx.core:core:${ANDROID_X_CORE_VERSION}"
+    api "androidx.test:core:${ANDROID_X_TEST_CORE_VERSION}"
 }
 
 android {

diff --git a/third_party/disklrucache/build.gradle b/third_party/disklrucache/build.gradle
@@ -1,9 +1,5 @@
 apply plugin: 'com.android.library'
 
-repositories {
-  jcenter()
-}
-
 checkstyle {
     toolVersion = "6.6"
 }
@@ -13,8 +9,7 @@ checkstyle {
 }
 
 dependencies {
-    def junitVersion = hasProperty('JUNIT_VERSION') ? JUNIT_VERSION : '4.13.2';
-    testImplementation "junit:junit:${junitVersion}"
+    testImplementation "junit:junit:${JUNIT_VERSION}"
     testImplementation "com.google.truth:truth:${TRUTH_VERSION}"
 }