[pull] master from bumptech:master

.github/workflows/build.yml

@@ -5,21 +5,53 @@ on:
     pull_request:
 
 jobs:
-    build:
-        runs-on: ubuntu-latest
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout project
+        uses: actions/checkout@v4
 
-        steps:
-          - uses: actions/checkout@v2
-          - name: Set up JDK 1.8
-            uses: actions/setup-java@v1
-            with:
-              java-version: '1.8'
-          - name: Build and run unit tests with Gradle
-            run: ./scripts/ci_unit.sh
-          - name: Publish to Sonatype
-            env:
-              NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
-              NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
-            if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'bumptech/glide' }}
-            run: ./gradlew uploadArchives -PNEXUS_USERNAME="${NEXUS_USERNAME}" -PNEXUS_PASSWORD="${NEXUS_PASSWORD}"
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: "zulu"
+          java-version: "17"
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Run Gradle Build
+        run: |
+          ./gradlew build \
+            -x :library:test:testDebugUnitTest \
+            :library:test:assembleDebugUnitTest \
+            -x :library:testDebugUnitTest \
+            :library:assembleDebugUnitTest \
+            -x :annotation:ksp:test:testDebugUnitTest \
+            :annotation:ksp:test:assembleDebugUnitTest \
+            -x :third_party:disklrucache:testDebugUnitTest \
+            :third_party:disklrucache:assembleDebugUnitTest \
+            -x :integration:cronet:testDebugUnitTest \
+            :integration:cronet:assembleDebugUnitTest \
+            -x :integration:gifencoder:testDebugUnitTest \
+            :integration:gifencoder:assembleDebugUnitTest \
+            -x :integration:ktx:testDebugUnitTest \
+            :integration:ktx:assembleDebugUnitTest \
+            -x :integration:concurrent:testDebugUnitTest \
+            :integration:concurrent:assembleDebugUnitTest \
+            -x :integration:volley:testDebugUnitTest \
+            :integration:volley:assembleDebugUnitTest \
+            -x :integration:sqljournaldiskcache:testDebugUnitTest \
+            :integration:sqljournaldiskcache:assembleDebugUnitTest \
+            -x :third_party:gif_decoder:testDebugUnitTest \
+            :third_party:gif_decoder:assembleDebugUnitTest \
+            :samples:flickr:build \
+            :samples:giphy:build \
+            :samples:contacturi:build \
+            :samples:gallery:build \
+            :samples:imgur:build \
+            :samples:svg:build \
+            :instrumentation:assembleAndroidTest \
+            :benchmark:assembleAndroidTest \
+            :glide:releaseJavadoc \
+            --parallel

.github/workflows/publish-manual.yml

@@ -0,0 +1,28 @@
+name: Publish to Maven (manual)
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout project
+        uses: actions/checkout@v4
+      - name: Make Gradle wrapper executable
+        run: chmod +x ./gradlew
+      - uses: actions/setup-java@v4
+        with:
+          distribution: "zulu"
+          java-version: "17"
+      - name: Build and publish everything to Maven Central
+      # This can be improved in Gradle
+        run: ./gradlew :mocks:publishToMavenCentral :annotation:publishToMavenCentral :annotation:compiler:publishToMavenCentral :library:publishToMavenCentral :integration:sqljournaldiskcache:publishToMavenCentral :annotation:ksp:publishToMavenCentral :integration:recyclerview:publishToMavenCentral :integration:avif:publishToMavenCentral :integration:okhttp:publishToMavenCentral :integration:gifencoder:publishToMavenCentral :integration:ktx:publishToMavenCentral :integration:okhttp4:publishToMavenCentral :integration:volley:publishToMavenCentral :integration:concurrent:publishToMavenCentral :integration:cronet:publishToMavenCentral :integration:okhttp3:publishToMavenCentral :integration:compose:publishToMavenCentral :third_party:disklrucache:publishToMavenCentral :third_party:gif_decoder:publishToMavenCentral
+        env:
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.MAVEN_SIGNING_KEY_ID }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.MAVEN_SIGNING_PRIVATE_KEY }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.MAVEN_SIGNING_PRIVATE_KEY_PASSWORD }}
+          ORG_GRADLE_PROJECT_mavenCentralPublishing: true
+          ORG_GRADLE_PROJECT_mavenCentralAutomaticPublishing: false

README.md

@@ -1,7 +1,7 @@
 Glide
 =====
 
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.bumptech.glide/glide/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.bumptech.glide/glide) [![Build Status](https://travis-ci.org/bumptech/glide.svg?branch=master)](https://travis-ci.org/bumptech/glide)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.bumptech.glide/glide/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.bumptech.glide/glide)
 | [View Glide's documentation][20] | [简体中文文档][22] | [Report an issue with Glide][5]
 
 Glide is a fast and efficient open source media management and image loading framework for Android that wraps media
@@ -26,13 +26,12 @@ Or use Gradle:
 
 ```gradle
 repositories {
-  google()
+  google()
   mavenCentral()
 }
 
 dependencies {
-  implementation 'com.github.bumptech.glide:glide:4.12.0'
-  annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
+  implementation 'com.github.bumptech.glide:glide:5.0.5'
 }
 ```
 
@@ -42,38 +41,15 @@ Or Maven:
 <dependency>
   <groupId>com.github.bumptech.glide</groupId>
   <artifactId>glide</artifactId>
-  <version>4.12.0</version>
-</dependency>
-<dependency>
-  <groupId>com.github.bumptech.glide</groupId>
-  <artifactId>compiler</artifactId>
-  <version>4.12.0</version>
-  <optional>true</optional>
+  <version>5.0.5</version>
 </dependency>
 ```
 
 For info on using the bleeding edge, see the [Snapshots][17] docs page.
 
-ProGuard
+R8 / Proguard
 --------
-Depending on your ProGuard (DexGuard) config and usage, you may need to include the following lines in your proguard.cfg (see the [Download and Setup docs page][25] for more details):
-
-```pro
--keep public class * implements com.bumptech.glide.module.GlideModule
--keep class * extends com.bumptech.glide.module.AppGlideModule {
- <init>(...);
-}
--keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
-  **[] $VALUES;
-  public *;
-}
--keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder {
-  *** rewind();
-}
-
-# for DexGuard only
--keepresourcexmlelements manifest/application/meta-data@value=GlideModule
-```
+The specific rules are [already bundled](library/proguard-rules.txt) into the aar which can be interpreted by R8 automatically
 
 How do I use Glide?
 -------------------
@@ -89,7 +65,7 @@ Simple use cases will look something like this:
   ...
   ImageView imageView = (ImageView) findViewById(R.id.my_image_view);
 
-  Glide.with(this).load("http://goo.gl/gEgYUd").into(imageView);
+  Glide.with(this).load("https://goo.gl/gEgYUd").into(imageView);
 }
 
 // For a simple image list:

annotation/build.gradle.kts

@@ -0,0 +1,10 @@
+plugins {
+    id("java")
+}
+
+apply(from = "${rootProject.projectDir}/scripts/upload.gradle.kts")
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}

annotation/compiler/build.gradle.kts

@@ -0,0 +1,20 @@
+plugins {
+    id("java")
+}
+
+dependencies {
+    implementation(libs.javapoet)
+    implementation(libs.guava)
+
+    compileOnly(libs.autoservice)
+    compileOnly(libs.findbugs.jsr305)
+
+    implementation(project(":annotation"))
+    annotationProcessor(libs.autoservice)
+}
+
+tasks.withType<Javadoc> {
+    isFailOnError = false
+}
+
+apply(from = "${rootProject.projectDir}/scripts/upload.gradle.kts")

annotation/compiler/src/main/java/com/bumptech/glide/annotation/compiler/ExtensionProcessor.java

@@ -21,10 +21,12 @@ final class ExtensionProcessor {
   ExtensionProcessor(
       ProcessingEnvironment processingEnvironment,
       ProcessorUtil processorUtil,
-      IndexerGenerator indexerGenerator) {
+      IndexerGenerator indexerGenerator,
+      boolean useLegacyTypeComparison) {
     this.processorUtil = processorUtil;
     this.indexerGenerator = indexerGenerator;
-    extensionValidator = new GlideExtensionValidator(processingEnvironment, processorUtil);
+    extensionValidator =
+        new GlideExtensionValidator(processingEnvironment, processorUtil, useLegacyTypeComparison);
   }
 
   boolean processExtensions(RoundEnvironment env) {

annotation/compiler/src/main/java/com/bumptech/glide/annotation/compiler/GlideAnnotationProcessor.java

@@ -2,6 +2,7 @@
 
 import com.bumptech.glide.annotation.GlideType;
 import com.google.auto.service.AutoService;
+import com.google.common.collect.ImmutableSet;
 import java.util.HashSet;
 import java.util.Set;
 import javax.annotation.processing.AbstractProcessor;
@@ -62,11 +63,13 @@
 @AutoService(Processor.class)
 public final class GlideAnnotationProcessor extends AbstractProcessor {
   static final boolean DEBUG = false;
+  private static final String USE_LEGACY_TYPE_COMPARISON_OPTION = "glide.useLegacyTypeComparison";
   private ProcessorUtil processorUtil;
   private LibraryModuleProcessor libraryModuleProcessor;
   private AppModuleProcessor appModuleProcessor;
   private boolean isGeneratedAppGlideModuleWritten;
   private ExtensionProcessor extensionProcessor;
+  private boolean useLegacyTypeComparison;
 
   @Override
   public synchronized void init(ProcessingEnvironment processingEnvironment) {
@@ -75,8 +78,17 @@ public synchronized void init(ProcessingEnvironment processingEnvironment) {
     IndexerGenerator indexerGenerator = new IndexerGenerator(processorUtil);
     libraryModuleProcessor = new LibraryModuleProcessor(processorUtil, indexerGenerator);
     appModuleProcessor = new AppModuleProcessor(processingEnvironment, processorUtil);
+    useLegacyTypeComparison =
+        Boolean.parseBoolean(
+            processingEnvironment.getOptions().get(USE_LEGACY_TYPE_COMPARISON_OPTION));
     extensionProcessor =
-        new ExtensionProcessor(processingEnvironment, processorUtil, indexerGenerator);
+        new ExtensionProcessor(
+            processingEnvironment, processorUtil, indexerGenerator, useLegacyTypeComparison);
+  }
+
+  @Override
+  public Set<String> getSupportedOptions() {
+    return ImmutableSet.of(USE_LEGACY_TYPE_COMPARISON_OPTION);
   }
 
   @Override