Add version 3.4.0

Author: cyphiria

CHANGELOG.md

@@ -1,3 +1,13 @@
+## [3.4.0]
+
+### Changed
+
+* [react-native-photoeditorsdk] Raised minimum PhotoEditor Build SDK for Android version to 35
+* [react-native-photoeditorsdk] Raised Kotlin version to 2.1 and KSP to 2.1.0-1.0.28
+* [react-native-videoeditorsdk] Raised minimum PhotoEditor Build SDK for Android version to 35
+* [react-native-videoeditorsdk] Raised Kotlin version to 2.1 and KSP to 2.1.0-1.0.28
+
+
 ## [3.3.0]
 
 ### Changed

README.md

@@ -72,11 +72,11 @@ In order to use this module with the Expo CLI you can make use of our integrated
                "ui:filter",
                "assets:filter-basic"
              ],
-             "buildToolsVersion": "34.0.0",
+             "buildToolsVersion": "35.0.0",
              "minSdkVersion": "21",
-             "compileSdkVersion": "34",
-             "targetSdkVersion": "34",
-             "kotlinGradlePluginVersion": "1.8.0"
+             "compileSdkVersion": "35",
+             "targetSdkVersion": "35",
+             "kotlinGradlePluginVersion": "2.1.0"
            }
          }
        ]
@@ -139,8 +139,8 @@ For older React Native versions autolinking is not available and VideoEditor SDK
            maven { url "https://artifactory.img.ly/artifactory/imgly" }
        }
        dependencies {
-           classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
-           classpath 'com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:1.8.0-1.0.9' // KSP version is depending on your Kotlin version.
+           classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
+           classpath 'com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:2.1.0-1.0.28' // KSP version is depending on your Kotlin version.
            classpath 'ly.img.android.sdk:plugin:10.9.0'
        }
    }
@@ -160,18 +160,18 @@ For older React Native versions autolinking is not available and VideoEditor 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 `34.0.0` or higher as well as the `compileSdkVersion` to `34` or higher but this is not mandatory:
+3. In the same file, you will need to modify the `minSdkVersion` to at least `21`. We also recommend to update the `buildToolsVersion` to `35.0.0` or higher as well as the `compileSdkVersion` to `35` or higher but this is not mandatory:
 
    ```diff
    buildscript {
        ext {
    -       buildToolsVersion = "30.0.2"
-   +       buildToolsVersion = "34.0.0"
+   +       buildToolsVersion = "35.0.0"
    -       minSdkVersion = 19
    +       minSdkVersion = 21
-   -       compileSdkVersion = 34
-   +       compileSdkVersion = 34
-           targetSdkVersion = 34
+   -       compileSdkVersion = 30
+   +       compileSdkVersion = 35
+           targetSdkVersion = 35
        }
    }
    ```

android/build.gradle

@@ -40,12 +40,12 @@ task checkVersion {
 preBuild.dependsOn checkVersion
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 34)
-    buildToolsVersion safeExtGet('buildToolsVersion', '34.0.0')
+    compileSdkVersion safeExtGet('compileSdkVersion', 35)
+    buildToolsVersion safeExtGet('buildToolsVersion', '35.0.0')
 
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 21)
-        targetSdkVersion safeExtGet('targetSdkVersion', 34)
+        targetSdkVersion safeExtGet('targetSdkVersion', 35)
         versionCode 1
         versionName "1.0"
     }

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip

android/src/main/java/ly/img/react_native/vesdk/RNVideoEditorSDKModule.kt

@@ -182,12 +182,14 @@ class RNVideoEditorSDKModule(reactContext: ReactApplicationContext) : ReactConte
         }
     }
 
-    override fun onNewIntent(intent: Intent?) {
+    override fun onNewIntent(intent: Intent) {
     }
 
     @ReactMethod
     fun present(video: String, config: ReadableMap?, serialization: String?, promise: Promise) {
-        val configuration = ConfigLoader.readFrom(config?.toHashMap() ?: mapOf())
+        val rawConfig: Map<String, Any?> = config?.toHashMap() ?: emptyMap()
+        val cleanConfig: Map<String, Any> = rawConfig.filterValues { it != null }.mapValues { it.value as Any }
+        val configuration = ConfigLoader.readFrom(cleanConfig)
         val serializationEnabled = configuration.export?.serialization?.enabled == true
         val exportVideoSegments = configuration.export?.video?.segments == true
         val createTemporaryFiles = serializationEnabled || exportVideoSegments
@@ -211,7 +213,12 @@ class RNVideoEditorSDKModule(reactContext: ReactApplicationContext) : ReactConte
         val videoArray = deserializeVideoParts(videos)
         var source = resolveSize(size)
 
-        val configuration = ConfigLoader.readFrom(config?.toHashMap() ?: mapOf())
+        val rawConfig: Map<String, Any?> = config?.toHashMap() ?: emptyMap()
+        val cleanConfig: MutableMap<String, Any> = mutableMapOf()
+        for ((key, value) in rawConfig) {
+            if (value != null) cleanConfig[key] = value
+        }
+        val configuration = ConfigLoader.readFrom(cleanConfig)
         val serializationEnabled = configuration.export?.serialization?.enabled == true
         val exportVideoSegments = configuration.export?.video?.segments == true
         val createTemporaryFiles = serializationEnabled || exportVideoSegments

package.json

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