Add version 2.13.0

Author: leontobias

CHANGELOG.md

@@ -1,3 +1,16 @@
+## [2.13.0]
+
+### Changed
+
+* 🚨 With this version you might need to create symlinks when using Android Gradle Plugin version `4.x`. Please refer to the new [known issues](https://github.com/imgly/vesdk-react-native#known-issues) section of the README for details.
+* 🚨 This version requires `minSdkVersion` `21` for Android. Please refer to the new step 3 in the [getting started](https://github.com/imgly/vesdk-react-native#android) section of the README for instructions on how to adjust it.
+* [react-native-videoeditorsdk] Raised minimum VideoEditor SDK for Android version to 10.0.1. See the [changelog](https://github.com/imgly/vesdk-android-demo/blob/master/CHANGELOG.md) for more information.
+* [react-native-photoeditorsdk] Raised minimum PhotoEditor SDK for Android version to 10.0.1. See the [changelog](https://github.com/imgly/pesdk-android-demo/blob/master/CHANGELOG.md) for more information.
+
+### Added
+
+* [react-native-imglysdk] Added support to specify a custom `buildToolsVersion`, `minSdkVersion`, `compileSdkVersion`, `targetSdkVersion`, and `kotlinGradlePluginVersion` for Android with the Expo config plugin.
+
 ## [2.12.0]
 
 ### Changed

README.md

@@ -21,6 +21,27 @@ Check out our [video tutorial](https://img.ly/blog/a-photo-and-video-editor-for-
 
 ## Getting started
 
+### Known Issues
+
+With version `2.13.0`, we recommend using `compileSdkVersion` not lower than `31.0.0` for Android. However, this might interfere with your application's Android Gradle Plugin version if this is set to `4.x`.
+
+If you don't use a newer Android Gradle Plugin version, e.g., by updating at least to RN 0.68.0, you'll most likely encounter a build error similar to:
+```
+FAILURE: Build failed with an exception.
+
+* What went wrong:
+A problem occurred configuring project ':react-native-photoeditorsdk'.
+> com.android.builder.errors.EvalIssueException: Installed Build Tools revision 31.0.0 is corrupted. Remove and install again using the SDK Manager.
+
+* Try:
+Run with --stacktrace option to get the stack trace. Run with --info or --debug option to get more log output. Run with --scan to get full insights.
+
+* Get more help at https://help.gradle.org
+```
+As a workaround you can create the following symlinks:
+  1. Inside `/Users/YOUR-USERNAME/Library/Android/sdk/build-tools/31.0.0/`: Create a `dx` symlink for the `d8` file with `ln -s d8 dx`.
+  2. From there, go to `./lib/` and create a `dx.jar` symlink for the `d8.jar` file with `ln -s d8.jar dx.jar`. 
+
 ### Expo CLI
 
 #### Limitations
@@ -47,7 +68,7 @@ In order to use this module with the Expo CLI you can make use of our integrated
    }
    ```
 
-   If needed, you can also use a specific version of our native library for Android as well as define explicitly the included modules. By default, all modules for both PhotoEditor SDK and VideoEditor SDK are included.
+   If needed, you can also use a specific version of our native library for Android as well as define explicitly the included modules. By default, all modules for both PhotoEditor SDK and VideoEditor SDK are included. Furthermore, you can configure the `buildToolsVersion`, `minSdkVersion`, `compileSdkVersion`, `targetSdkVersion`, and `kotlinGradlePluginVersion`.
 
    ```json
    {
@@ -56,13 +77,18 @@ In order to use this module with the Expo CLI you can make use of our integrated
          "react-native-imglysdk",
          {
            "android": {
-             "version": "9.2.0",
+             "version": "10.0.1",
              "modules": [
                "ui:core",
                "ui:transform",
                "ui:filter",
                "assets:filter-basic"
-             ]
+             ],
+             "buildToolsVersion": "31.0.0",
+             "minSdkVersion": "21",
+             "compileSdkVersion": "31",
+             "targetSdkVersion": "30",
+             "kotlinGradlePluginVersion": "1.5.32"
            }
          }
        ]
@@ -114,40 +140,22 @@ For older React Native versions autolinking is not available and PhotoEditor SDK
 
 #### Android
 
-1. Because PhotoEditor SDK for Android is quite large, there is a high chance that you will need to enable [Multidex](https://developer.android.com/studio/build/multidex) for your project as follows:
-
-   1. Open the `android/app/build.gradle` file (**not** `android/build.gradle`) and add these lines at the end:
-      ```groovy
-      android {
-          defaultConfig {
-              multiDexEnabled true
-          }
-      }
-      dependencies {
-          implementation 'androidx.multidex:multidex:2.0.1'
-      }
-      ```
-   2. Open the `android/app/src/main/java/.../MainApplication.java` file and change the superclass of your `MainApplication` class from `Application` to `androidx.multidex.MultiDexApplication`, e.g.:
-      ```java
-      public class MainApplication extends androidx.multidex.MultiDexApplication implements ReactApplication {
-      ```
-
-2. Add the img.ly repository and plugin by opening the `android/build.gradle` file (**not** `android/app/build.gradle`) and adding these lines at the top:
+1. Add the img.ly repository and plugin by opening the `android/build.gradle` file (**not** `android/app/build.gradle`) and adding these lines at the top:
    ```groovy
    buildscript {
        repositories {
            mavenCentral()
            maven { url "https://artifactory.img.ly/artifactory/imgly" }
        }
        dependencies {
-           classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10"
-           classpath 'ly.img.android.sdk:plugin:9.2.0'
+           classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.32"
+           classpath 'ly.img.android.sdk:plugin:10.0.1'
        }
    }
    ```
-   In order to update PhotoEditor SDK for Android replace the version string `9.2.0` with a [newer release](https://github.com/imgly/pesdk-android-demo/releases).
+   In order to update PhotoEditor SDK for Android replace the version string `10.0.1` with a [newer release](https://github.com/imgly/pesdk-android-demo/releases).
 
-3. Still in the `android/build.gradle` file (**not** `android/app/build.gradle`), add these lines at the bottom:
+2. Still in the `android/build.gradle` file (**not** `android/app/build.gradle`), add these lines at the bottom:
 
    ```groovy
    allprojects {
@@ -157,6 +165,22 @@ For older React Native versions autolinking is not available and PhotoEditor SDK
    }
    ```
 
+3. In the same file, you will need to modify the `minSdkVersion` to at least `21`. We also recommend to update the `buildToolsVersion` to `31.0.0` or higher as well as the `compileSdkVersion` to `31` or higher:
+
+   ```diff
+   buildscript {
+       ext {
+   -       buildToolsVersion = "30.0.2"
+   +       buildToolsVersion = "31.0.0"
+   -       minSdkVersion = 19
+   +       minSdkVersion = 21
+   -       compileSdkVersion = 30
+   +       compileSdkVersion = 31
+           targetSdkVersion = 30
+       }
+   }
+   ```
+
 4. Configure PhotoEditor SDK for Android by opening the `android/app/build.gradle` file  (**not** `android/build.gradle`) and adding the following lines under `apply plugin: "com.android.application"`:
    ```groovy
    apply plugin: 'ly.img.android.sdk'

android/build.gradle

@@ -20,7 +20,7 @@ imglyConfig {
     }
 }
 
-def MIN_LY_IMG_ANDROID_SDK_PLUGIN_VERSION = "9.2.0"
+def MIN_LY_IMG_ANDROID_SDK_PLUGIN_VERSION = "10.0.1"
 
 task checkVersion {
     if (imglyConfig.convertToVersionNumber(imglyConfig.getVersion()) < imglyConfig.convertToVersionNumber(MIN_LY_IMG_ANDROID_SDK_PLUGIN_VERSION)) {
@@ -39,11 +39,11 @@ task checkVersion {
 preBuild.dependsOn checkVersion
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 30)
-    buildToolsVersion safeExtGet('buildToolsVersion', '30.0.3')
+    compileSdkVersion safeExtGet('compileSdkVersion', 31)
+    buildToolsVersion safeExtGet('buildToolsVersion', '31.0.0')
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 19)
+        minSdkVersion safeExtGet('minSdkVersion', 21)
         targetSdkVersion safeExtGet('targetSdkVersion', 30)
         versionCode 1
         versionName "1.0"

android/src/main/java/ly/img/react_native/pesdk/RNPhotoEditorSDKModule.kt

@@ -2,7 +2,6 @@ package ly.img.react_native.pesdk
 
 import android.app.Activity
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.net.Uri
 import android.util.Log
 import com.facebook.react.bridge.*
@@ -40,7 +39,6 @@ class RNPhotoEditorSDKModule(val reactContext: ReactApplicationContext) : ReactC
 
     }
 
-    private var currentSettingsList: PhotoEditorSettingsList? = null
     private var currentPromise: Promise? = null
     private var currentConfig: Configuration? = null
 
@@ -69,9 +67,9 @@ class RNPhotoEditorSDKModule(val reactContext: ReactApplicationContext) : ReactC
                             val resultPath = data.resultUri
 
                             val serializationConfig = currentConfig?.export?.serialization
-                            val settingsList = data.settingsList
 
                             val serialization: Any? = if (serializationConfig?.enabled == true) {
+                                val settingsList = data.settingsList
                                 skipIfNotExists {
                                     settingsList.let { settingsList ->
                                         if (serializationConfig.embedSourceImage == true) {
@@ -100,6 +98,7 @@ class RNPhotoEditorSDKModule(val reactContext: ReactApplicationContext) : ReactC
                                     Log.i("ImgLySdk", "You need to include 'backend:serializer' Module, to use serialisation!")
                                     null
                                 }
+                                settingsList.release()
                             } else {
                                 null
                             }
@@ -133,12 +132,10 @@ class RNPhotoEditorSDKModule(val reactContext: ReactApplicationContext) : ReactC
     fun present(image: String?, config: ReadableMap?, serialization: String?, promise: Promise) {
         IMGLY.authorize()
 
-        val settingsList = PhotoEditorSettingsList()
-
-        currentSettingsList = settingsList
-        currentConfig = ConfigLoader.readFrom(config?.toHashMap() ?: mapOf()).also {
-            it.applyOn(settingsList)
-        }
+        val configuration = ConfigLoader.readFrom(config?.toHashMap() ?: mapOf())
+        val settingsList = PhotoEditorSettingsList(configuration.export?.serialization?.enabled == true)
+        configuration.applyOn(settingsList)
+        currentConfig = configuration
         currentPromise = promise
 
         settingsList.configure<LoadSettings> { loadSettings ->
@@ -178,6 +175,7 @@ class RNPhotoEditorSDKModule(val reactContext: ReactApplicationContext) : ReactC
                 PhotoEditorBuilder(currentActivity)
                   .setSettingsList(settingsList)
                   .startActivityForResult(currentActivity, EDITOR_RESULT_ID)
+                settingsList.release()
             }()
         }
     }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-photoeditorsdk",
   "title": "React Native module for PhotoEditor SDK",
-  "version": "2.12.0",
+  "version": "2.13.0",
   "description": "A React Native module for PhotoEditor SDK. Integrate the photo editor into your own HTML5, iOS or Android app - in minutes!",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -38,6 +38,6 @@
     "react-native": ">=0.60.0 <1.0.x"
   },
   "dependencies": {
-    "react-native-imglysdk": "2.12.0"
+    "react-native-imglysdk": "2.13.0"
   }
 }