expo-image-loader 2.2.0 → 3.1.1

package/CHANGELOG.md

@@ -10,6 +10,30 @@
 
 ### 💡 Others
 
+## 3.1.1 — 2022-02-01
+
+### 🐛 Bug fixes
+
+- Fix `Plugin with id 'maven' not found` build error from Android Gradle 7. ([#16080](https://github.com/expo/expo/pull/16080) by [@kudo](https://github.com/kudo))
+
+## 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

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

@@ -1,6 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 
 buildscript {
   // Simple helper that allows the root project to override versions declared by this library.
@@ -18,12 +18,7 @@ buildscript {
 }
 
 group = 'host.exp.exponent'
-version = '2.2.0'
-
-// Upload android library to maven with javadoc and android sources
-configurations {
-  deployerJars
-}
+version = '3.1.1'
 
 // Creating sources with comments
 task androidSourcesJar(type: Jar) {
@@ -31,16 +26,19 @@ task androidSourcesJar(type: Jar) {
   from android.sourceSets.main.java.srcDirs
 }
 
-// Put the androidSources and javadoc to the artifacts
-artifacts {
-  archives androidSourcesJar
-}
-
-uploadArchives {
-  repositories {
-    mavenDeployer {
-      configuration = configurations.deployerJars
-      repository(url: mavenLocal().url)
+afterEvaluate {
+  publishing {
+    publications {
+      release(MavenPublication) {
+        from components.release
+        // Add additional sourcesJar to artifacts
+        artifact(androidSourcesJar)
+      }
+    }
+    repositories {
+      maven {
+        url = mavenLocal().url
+      }
     }
   }
 }
@@ -57,7 +55,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 30)
     versionCode 8
-    versionName "2.2.0"
+    versionName "3.1.1"
   }
   lintOptions {
     abortOnError false
@@ -68,17 +66,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 'expo-modules-core'
+  implementation project(':expo-modules-core')
 
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.4.21')}"
   api 'com.github.bumptech.glide:glide:4.9.0'

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

@@ -17,7 +17,7 @@ import com.facebook.imagepipeline.datasource.BaseBitmapDataSubscriber
 import com.facebook.imagepipeline.image.CloseableImage
 import com.facebook.imagepipeline.request.ImageRequest
 import expo.modules.interfaces.imageloader.ImageLoaderInterface
-import org.unimodules.core.interfaces.InternalModule
+import expo.modules.core.interfaces.InternalModule
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.Future
 
@@ -29,11 +29,14 @@ class ImageLoaderModule(val context: Context) : InternalModule, ImageLoaderInter
 
   override fun loadImageForDisplayFromURL(url: String): Future<Bitmap> {
     val future = SimpleSettableFuture<Bitmap>()
-    loadImageForDisplayFromURL(url, object : ImageLoaderInterface.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
   }
 
@@ -63,11 +66,14 @@ class ImageLoaderModule(val context: Context) : InternalModule, ImageLoaderInter
 
   override fun loadImageForManipulationFromURL(@NonNull url: String): Future<Bitmap> {
     val future = SimpleSettableFuture<Bitmap>()
-    loadImageForManipulationFromURL(url, object : ImageLoaderInterface.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
   }
 

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 <ExpoModulesCore/EXInternalModule.h>
 #import <ExpoModulesCore/EXImageLoaderInterface.h>
 #import <React/RCTBridgeModule.h>
 #import <UIKit/UIKit.h>
 
-@interface EXImageLoader : NSObject <RCTBridgeModule, UMInternalModule, EXImageLoaderInterface>
+@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
 {

package/ios/EXImageLoader.podspec

@@ -10,11 +10,11 @@ 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 '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')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-image-loader",
-  "version": "2.2.0",
+  "version": "3.1.1",
   "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": "c80d4c938920c5111e34c2dbca3a6bf500dff0e1"
+  "dependencies": {},
+  "devDependencies": {},
+  "peerDependencies": {
+    "expo": "*"
+  },
+  "gitHead": "ba24eba18bf4f4d4b0d54828992d81a2bb18246a"
 }