Merge pull request #197 from bumptech/master

Create a new pull request by comparing changes across two branches

.github/workflows/renovate-config-validation.yml

@@ -6,4 +6,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: suzuki-shunsuke/github-action-renovate-config-validator@v0.1.2
+      - uses: suzuki-shunsuke/github-action-renovate-config-validator@v0.1.3

annotation/compiler/test/build.gradle

@@ -27,6 +27,7 @@ afterEvaluate {
 }
 
 android {
+    namespace 'com.bumptech.glide.annotation.compiler.test'
     compileSdk libs.versions.compile.sdk.version.get()
 
     defaultConfig {
@@ -94,4 +95,3 @@ task regenerateTestResources {
 afterEvaluate {
     regenerateTestResources.finalizedBy(testReleaseUnitTest)
 }
-

annotation/ksp/integrationtest/build.gradle

@@ -15,6 +15,7 @@ plugins {
 }
 
 android {
+    namespace 'com.bumptech.glide.annotation.ksp.integrationtest'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
@@ -35,4 +36,4 @@ dependencies {
     testImplementation libs.truth
     testImplementation libs.kotlin.test
     testImplementation project(path: ':annotation:ksp:test')
-}
+}

annotation/ksp/test/build.gradle

@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+    namespace 'com.bumptech.glide.annotation.ksp.test'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
@@ -22,4 +23,4 @@ dependencies {
     testImplementation project(":annotation")
     testImplementation project(":glide")
     testImplementation libs.kotlin.test
-}
+}

benchmark/build.gradle

@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+    namespace 'com.bumptech.glide.benchmark'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     buildToolsVersion "30.0.3"
@@ -41,4 +42,4 @@ dependencies {
     androidTestImplementation project(':testutil')
     androidTestImplementation libs.androidx.benchmark.junit
     androidTestImplementation libs.guava
-}
+}

benchmark/src/androidTest/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?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">
+  xmlns:tools="http://schemas.android.com/tools">
 
   <!--
       Important: disable debugging for accurate performance results
@@ -14,4 +13,4 @@
     tools:ignore="HardcodedDebugMode"
     tools:replace="android:debuggable" >
   </application>
-</manifest>
+</manifest>

instrumentation/build.gradle

@@ -30,10 +30,10 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.instrumentation'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
-        applicationId 'com.bumptech.glide.instrumentation'
         minSdk libs.versions.min.sdk.version.get() as int
         targetSdk libs.versions.target.sdk.version.get() as int
         versionCode 1
@@ -53,4 +53,3 @@ android {
         }
     }
 }
-

instrumentation/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
+<?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.instrumentation">
+    xmlns:tools="http://schemas.android.com/tools">
+
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
   <application

integration/avif/build.gradle

@@ -9,6 +9,7 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.integration.avif'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {

integration/compose/build.gradle

@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+    namespace 'com.bumptech.glide.integration.compose'
     compileSdk 33
 
     defaultConfig {

integration/concurrent/build.gradle

@@ -14,6 +14,7 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.integration.concurrent'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {

integration/cronet/build.gradle

@@ -16,6 +16,7 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.integration.cronet'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {

integration/cronet/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.bumptech.glide.integration.cronet">
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
     <application>
         <meta-data
             android:name="com.bumptech.glide.integration.cronet.CronetGlideModule"

integration/cronet/src/test/AndroidManifest.xml

@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.bumptech.glide.integration.cronet">
-  <application />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26"/>
 </manifest>
-

integration/gifencoder/build.gradle

@@ -14,6 +14,7 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.integration.gifencoder'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     sourceSets {

integration/ktx/build.gradle

@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+    namespace 'com.bumptech.glide.integration.ktx'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {

integration/okhttp/build.gradle

@@ -9,6 +9,7 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.integration.okhttp'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {

integration/okhttp3/build.gradle

@@ -9,6 +9,7 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.integration.okhttp'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {

integration/okhttp3/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.bumptech.glide.integration.okhttp">
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <meta-data

integration/okhttp4/build.gradle

@@ -9,6 +9,7 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.integration.okhttp'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {

integration/recyclerview/build.gradle

@@ -7,6 +7,7 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.integration.recyclerview'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {

integration/sqljournaldiskcache/build.gradle

@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+    namespace 'com.bumptech.glide.integration.sqljournaldiskcache'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {

integration/volley/build.gradle

@@ -18,6 +18,7 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.integration.volley'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {

integration/volley/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.bumptech.glide.integration.volley">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <meta-data

library/build.gradle

@@ -59,6 +59,7 @@ if (project.plugins.hasPlugin('net.ltgt.errorprone')) {
 }
 
 android {
+    namespace 'com.bumptech.glide'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {

library/src/main/java/com/bumptech/glide/request/BaseRequestOptions.java

@@ -1209,31 +1209,42 @@ public T apply(@NonNull BaseRequestOptions<?> o) {
     return selfOrThrowIfLocked();
   }
 
+  /**
+   * Returns {@code true} if this {@link BaseRequestOptions} is equivalent to the given
+   * {@link BaseRequestOptions} (has all of the same options and sizes).
+   *
+   * <p>This method is identical to {@link #equals(Object)}, but this can not be overridden. We need
+   * to use this method instead of {@link #equals(Object)}, because child classes may have additional
+   * fields, such as listeners and models, that should not be considered when checking for equality.
+   */
+  public final boolean isEquivalentTo(BaseRequestOptions<?> other) {
+    return Float.compare(other.sizeMultiplier, sizeMultiplier) == 0
+        && errorId == other.errorId
+        && Util.bothNullOrEqual(errorPlaceholder, other.errorPlaceholder)
+        && placeholderId == other.placeholderId
+        && Util.bothNullOrEqual(placeholderDrawable, other.placeholderDrawable)
+        && fallbackId == other.fallbackId
+        && Util.bothNullOrEqual(fallbackDrawable, other.fallbackDrawable)
+        && isCacheable == other.isCacheable
+        && overrideHeight == other.overrideHeight
+        && overrideWidth == other.overrideWidth
+        && isTransformationRequired == other.isTransformationRequired
+        && isTransformationAllowed == other.isTransformationAllowed
+        && useUnlimitedSourceGeneratorsPool == other.useUnlimitedSourceGeneratorsPool
+        && onlyRetrieveFromCache == other.onlyRetrieveFromCache
+        && diskCacheStrategy.equals(other.diskCacheStrategy)
+        && priority == other.priority
+        && options.equals(other.options)
+        && transformations.equals(other.transformations)
+        && resourceClass.equals(other.resourceClass)
+        && Util.bothNullOrEqual(signature, other.signature)
+        && Util.bothNullOrEqual(theme, other.theme);
+  }
+
   @Override
   public boolean equals(Object o) {
     if (o instanceof BaseRequestOptions<?>) {
-      BaseRequestOptions<?> other = (BaseRequestOptions<?>) o;
-      return Float.compare(other.sizeMultiplier, sizeMultiplier) == 0
-          && errorId == other.errorId
-          && Util.bothNullOrEqual(errorPlaceholder, other.errorPlaceholder)
-          && placeholderId == other.placeholderId
-          && Util.bothNullOrEqual(placeholderDrawable, other.placeholderDrawable)
-          && fallbackId == other.fallbackId
-          && Util.bothNullOrEqual(fallbackDrawable, other.fallbackDrawable)
-          && isCacheable == other.isCacheable
-          && overrideHeight == other.overrideHeight
-          && overrideWidth == other.overrideWidth
-          && isTransformationRequired == other.isTransformationRequired
-          && isTransformationAllowed == other.isTransformationAllowed
-          && useUnlimitedSourceGeneratorsPool == other.useUnlimitedSourceGeneratorsPool
-          && onlyRetrieveFromCache == other.onlyRetrieveFromCache
-          && diskCacheStrategy.equals(other.diskCacheStrategy)
-          && priority == other.priority
-          && options.equals(other.options)
-          && transformations.equals(other.transformations)
-          && resourceClass.equals(other.resourceClass)
-          && Util.bothNullOrEqual(signature, other.signature)
-          && Util.bothNullOrEqual(theme, other.theme);
+      return isEquivalentTo((BaseRequestOptions<?>) o);
     }
     return false;
   }