expo-image-loader 2.1.1 → 3.1.0

package/CHANGELOG.md

@@ -8,6 +8,32 @@
 
 ### 🐛 Bug fixes
 
+### 💡 Others
+
+## 3.1.0 — 2021-12-03
+
+_This version does not introduce any user-facing changes._
+
+## 3.0.0 — 2021-09-28
+
+### 🛠 Breaking changes
+
+- Dropped support for iOS 11.0 ([#14383](https://github.com/expo/expo/pull/14383) by [@cruzach](https://github.com/cruzach))
+
+### 🐛 Bug fixes
+
+- Fix building errors from use_frameworks! in Podfile. ([#14523](https://github.com/expo/expo/pull/14523) by [@kudo](https://github.com/kudo))
+
+## 2.3.0-alpha.0 — 2021-08-17
+
+_This version does not introduce any user-facing changes._
+
+## 2.2.0 — 2021-06-16
+
+### 🐛 Bug fixes
+
+- Enable kotlin in all modules. ([#12716](https://github.com/expo/expo/pull/12716) by [@wschurman](https://github.com/wschurman))
+
 ## 2.1.1 — 2021-03-23
 
 _This version does not introduce any user-facing changes._

package/README.md

@@ -8,7 +8,7 @@ For [managed](https://docs.expo.io/versions/latest/introduction/managed-vs-bare/
 
 # Installation in bare React Native projects
 
-For bare React Native projects, you must ensure that you have [installed and configured the `react-native-unimodules` package](https://github.com/expo/expo/tree/master/packages/react-native-unimodules) before continuing.
+For bare React Native projects, you must ensure that you have [installed and configured the `expo` package](https://docs.expo.dev/bare/installing-expo-modules/) before continuing.
 
 ### Add the package to your npm dependencies
 

package/android/build.gradle

@@ -13,12 +13,12 @@ buildscript {
   }
 
   dependencies {
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet("kotlinVersion", "1.4.21")}")
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.4.21')}")
   }
 }
 
 group = 'host.exp.exponent'
-version = '2.1.1'
+version = '3.1.0'
 
 // Upload android library to maven with javadoc and android sources
 configurations {
@@ -48,38 +48,30 @@ uploadArchives {
 android {
   compileSdkVersion safeExtGet("compileSdkVersion", 30)
 
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
+
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 30)
     versionCode 8
-    versionName "2.1.1"
+    versionName "3.1.0"
   }
   lintOptions {
     abortOnError false
   }
-  compileOptions {
-    sourceCompatibility = '1.8'
-    targetCompatibility = '1.8'
-  }
 }
 
 repositories {
   mavenCentral()
 }
 
-if (new File(rootProject.projectDir.parentFile, 'package.json').exists()) {
-  apply from: project(":unimodules-core").file("../unimodules-core.gradle")
-} else {
-  throw new GradleException(
-      '\'unimodules-core.gradle\' was not found in the usual React Native dependency location. ' +
-          'This package can only be used in such projects. Are you sure you\'ve installed the dependencies properly?')
-}
-
 dependencies {
-  unimodule 'unimodules-core'
-  unimodule 'unimodules-image-loader-interface'
+  implementation project(':expo-modules-core')
 
-  api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.4.21')}"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.4.21')}"
   api 'com.github.bumptech.glide:glide:4.9.0'
   api 'com.facebook.fresco:fresco:2.0.0'
 }

package/android/src/main/java/expo/modules/imageloader/ImageLoaderModule.kt

@@ -16,29 +16,31 @@ import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.imagepipeline.datasource.BaseBitmapDataSubscriber
 import com.facebook.imagepipeline.image.CloseableImage
 import com.facebook.imagepipeline.request.ImageRequest
-import org.unimodules.core.interfaces.InternalModule
-import org.unimodules.interfaces.imageloader.ImageLoader
+import expo.modules.interfaces.imageloader.ImageLoaderInterface
+import expo.modules.core.interfaces.InternalModule
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.Future
 
-
-class ImageLoaderModule(val context: Context) : InternalModule, ImageLoader {
+class ImageLoaderModule(val context: Context) : InternalModule, ImageLoaderInterface {
 
   override fun getExportedInterfaces(): List<Class<*>>? {
-    return listOf(ImageLoader::class.java)
+    return listOf(ImageLoaderInterface::class.java)
   }
 
   override fun loadImageForDisplayFromURL(url: String): Future<Bitmap> {
     val future = SimpleSettableFuture<Bitmap>()
-    loadImageForDisplayFromURL(url, object : ImageLoader.ResultListener {
-      override fun onSuccess(bitmap: Bitmap) = future.set(bitmap)
+    loadImageForDisplayFromURL(
+      url,
+      object : ImageLoaderInterface.ResultListener {
+        override fun onSuccess(bitmap: Bitmap) = future.set(bitmap)
 
-      override fun onFailure(@Nullable cause: Throwable?) = future.setException(ExecutionException(cause))
-    })
+        override fun onFailure(@Nullable cause: Throwable?) = future.setException(ExecutionException(cause))
+      }
+    )
     return future
   }
 
-  override fun loadImageForDisplayFromURL(url: String, resultListener: ImageLoader.ResultListener) {
+  override fun loadImageForDisplayFromURL(url: String, resultListener: ImageLoaderInterface.ResultListener) {
     val imageRequest = ImageRequest.fromUri(url)
     val imagePipeline = Fresco.getImagePipeline()
     val dataSource = imagePipeline.fetchDecodedImage(imageRequest, context)
@@ -64,15 +66,18 @@ class ImageLoaderModule(val context: Context) : InternalModule, ImageLoader {
 
   override fun loadImageForManipulationFromURL(@NonNull url: String): Future<Bitmap> {
     val future = SimpleSettableFuture<Bitmap>()
-    loadImageForManipulationFromURL(url, object : ImageLoader.ResultListener {
-      override fun onSuccess(bitmap: Bitmap) = future.set(bitmap)
+    loadImageForManipulationFromURL(
+      url,
+      object : ImageLoaderInterface.ResultListener {
+        override fun onSuccess(bitmap: Bitmap) = future.set(bitmap)
 
-      override fun onFailure(@NonNull cause: Throwable?) = future.setException(ExecutionException(cause))
-    })
+        override fun onFailure(@NonNull cause: Throwable?) = future.setException(ExecutionException(cause))
+      }
+    )
     return future
   }
 
-  override fun loadImageForManipulationFromURL(url: String, resultListener: ImageLoader.ResultListener) {
+  override fun loadImageForManipulationFromURL(url: String, resultListener: ImageLoaderInterface.ResultListener) {
     val normalizedUrl = normalizeAssetsUrl(url)
 
     Glide.with(context)

package/android/src/main/java/expo/modules/imageloader/ImageLoaderPackage.kt

@@ -1,8 +1,8 @@
 package expo.modules.imageloader
 
 import android.content.Context
-import org.unimodules.core.BasePackage
-import org.unimodules.core.interfaces.InternalModule
+import expo.modules.core.BasePackage
+import expo.modules.core.interfaces.InternalModule
 
 class ImageLoaderPackage : BasePackage() {
   override fun createInternalModules(context: Context): List<InternalModule> = listOf(ImageLoaderModule(context))

package/ios/EXImageLoader/EXImageLoader.h

@@ -1,10 +1,10 @@
 // Copyright 2019-present 650 Industries. All rights reserved.
 
-#import <UMCore/UMInternalModule.h>
-#import <UMImageLoaderInterface/UMImageLoaderInterface.h>
+#import <ExpoModulesCore/EXInternalModule.h>
+#import <ExpoModulesCore/EXImageLoaderInterface.h>
 #import <React/RCTBridgeModule.h>
 #import <UIKit/UIKit.h>
 
-@interface EXImageLoader : NSObject <RCTBridgeModule, UMInternalModule, UMImageLoaderInterface>
+@interface EXImageLoader : NSObject <RCTBridgeModule, EXInternalModule, EXImageLoaderInterface>
 
 @end

package/ios/EXImageLoader/EXImageLoader.m

@@ -2,6 +2,7 @@
 
 #import <EXImageLoader/EXImageLoader.h>
 #import <React/RCTImageLoaderProtocol.h>
+#import <ExpoModulesCore/EXUtilities.h>
 
 @interface EXImageLoader ()
 
@@ -11,7 +12,7 @@
 
 @implementation EXImageLoader
 
-UM_REGISTER_MODULE();
+EX_REGISTER_MODULE();
 
 + (NSString *)moduleName
 {
@@ -20,7 +21,7 @@ UM_REGISTER_MODULE();
 
 + (const NSArray<Protocol *> *)exportedInterfaces
 {
-  return @[@protocol(UMImageLoaderInterface)];
+  return @[@protocol(EXImageLoaderInterface)];
 }
 
 - (void)setBridge:(RCTBridge *)bridge
@@ -29,7 +30,7 @@ UM_REGISTER_MODULE();
 }
 
 - (void)loadImageForURL:(NSURL *)imageURL
-      completionHandler:(UMImageLoaderCompletionBlock)completionHandler
+      completionHandler:(EXImageLoaderCompletionBlock)completionHandler
 {
   [[_bridge moduleForName:@"ImageLoader" lazilyLoadIfNecessary:YES] loadImageWithURLRequest:[NSURLRequest requestWithURL:imageURL]
                                                                   callback:^(NSError *error, UIImage *loadedImage) {

package/ios/EXImageLoader.podspec

@@ -10,12 +10,12 @@ Pod::Spec.new do |s|
   s.license        = package['license']
   s.author         = package['author']
   s.homepage       = package['homepage']
-  s.platform       = :ios, '11.0'
+  s.platform       = :ios, '12.0'
   s.source         = { git: 'https://github.com/expo/expo.git' }
+  s.static_framework = true
 
   s.dependency 'React-Core'
-  s.dependency 'UMCore'
-  s.dependency 'UMImageLoaderInterface'
+  s.dependency 'ExpoModulesCore'
 
   if !$ExpoUseSources&.include?(package['name']) && ENV['EXPO_USE_SOURCE'].to_i == 0 && File.exist?("#{s.name}.xcframework") && Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.10.0')
     s.source_files = "#{s.name}/**/*.h"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-image-loader",
-  "version": "2.1.1",
+  "version": "3.1.0",
   "description": "Image loader",
   "main": "index.js",
   "keywords": [
@@ -19,5 +19,10 @@
   "author": "650 Industries, Inc.",
   "license": "MIT",
   "homepage": "https://github.com/expo/expo/tree/master/packages/expo-image-loader",
-  "gitHead": "c2520eef58fddcc435c41d95829084f5f89b3e8e"
+  "dependencies": {},
+  "devDependencies": {},
+  "peerDependencies": {
+    "expo": "*"
+  },
+  "gitHead": "2e5c6983b86d5ecfca028ba64002897d8adc2cc4"
 }