expo-image 2.1.0-canary-20250207-8bc5146 → 2.1.0-canary-20250221-ef26fed

package/CHANGELOG.md

@@ -11,6 +11,8 @@
 ### 🐛 Bug fixes
 
 - Fixed `tintColor="currentColor"` conflicts on web. ([#34604](https://github.com/expo/expo/pull/34604) by [@bradleyayers](https://github.com/bradleyayers))
+- [Android] Add headers to `loadAsync` requests. ([#34767](https://github.com/expo/expo/pull/34767) by [@alanjhughes](https://github.com/alanjhughes))
+- [Android] Fixes a regression in `loadAsync` from [#34767](https://github.com/expo/expo/pull/34767). ([#34965](https://github.com/expo/expo/pull/34965) by [@alanjhughes](https://github.com/alanjhughes))
 
 ### 💡 Others
 

package/android/build.gradle

@@ -1,29 +1,7 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-kapt'
-
-def useLegacyExpoModulesCorePlugin = {
-  def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
-  apply from: expoModulesCorePlugin
-  applyKotlinExpoModulesCorePlugin()
-  useCoreDependencies()
-  useDefaultAndroidSdkVersions()
-}
-
-try {
-  apply plugin: 'expo-module-gradle-plugin'
-} catch (e) {
-  if (!e instanceof UnknownPluginException) {
-    throw e
-  }
-
-  useLegacyExpoModulesCorePlugin()
-}
-
-buildscript {
-  // Simple helper that allows the root project to override versions declared by this library.
-  ext.safeExtGet = { prop, fallback ->
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-  }
+plugins {
+  id 'com.android.library'
+  id 'kotlin-kapt'
+  id 'expo-module-gradle-plugin'
 }
 
 android {
@@ -39,7 +17,7 @@ android {
   sourceSets {
     main {
       java {
-        if (safeExtGet("excludeAppGlideModule", false)) {
+        if (expoModule.safeExtGet("excludeAppGlideModule", false)) {
           exclude("**/ExpoImageAppGlideModule.kt")
         }
       }
@@ -60,7 +38,7 @@ dependencies {
   implementation "com.github.bumptech.glide:avif-integration:${GLIDE_VERSION}"
 
   api 'com.github.bumptech.glide:okhttp3-integration:4.11.0'
-  api "com.squareup.okhttp3:okhttp:${safeExtGet("okHttpVersion", '4.9.2')}"
+  api "com.squareup.okhttp3:okhttp:${expoModule.safeExtGet("okHttpVersion", '4.9.2')}"
 
   implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1'
   implementation "jp.wasabeef:glide-transformations:4.3.0"

package/android/src/main/java/expo/modules/image/ImageLoadTask.kt

@@ -17,12 +17,15 @@ open class ImageLoadTask(
     val context =
       this@ImageLoadTask.appContext.reactContext ?: throw Exceptions.ReactContextLost()
 
+    val sourceToLoad = source.createGlideModelProvider(context)
+    val model = sourceToLoad?.getGlideModel()
+
     try {
       val bitmap = withContext(Dispatchers.IO) {
         Glide
           .with(context)
           .asDrawable()
-          .load(source.uri)
+          .load(model)
           .centerInside()
           .submit(options.maxWidth, options.maxHeight)
           .get()

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-image",
   "title": "Expo Image",
-  "version": "2.1.0-canary-20250207-8bc5146",
+  "version": "2.1.0-canary-20250221-ef26fed",
   "description": "A cross-platform, performant image component for React Native and Expo with Web support",
   "main": "src/index.ts",
   "types": "build/index.d.ts",
@@ -28,10 +28,10 @@
   "license": "MIT",
   "dependencies": {},
   "devDependencies": {
-    "expo-module-scripts": "4.0.4-canary-20250207-8bc5146"
+    "expo-module-scripts": "4.0.5-canary-20250221-ef26fed"
   },
   "peerDependencies": {
-    "expo": "53.0.0-canary-20250207-8bc5146",
+    "expo": "53.0.0-canary-20250221-ef26fed",
     "react": "*",
     "react-native": "*",
     "react-native-web": "*"
@@ -40,6 +40,5 @@
     "react-native-web": {
       "optional": true
     }
-  },
-  "gitHead": "8bc5146852ccd7033138bac9ef8d3c41ae85a211"
+  }
 }