@imgly/camera-react-native 1.47.0 → 1.49.0

package/android/build.gradle

@@ -6,16 +6,38 @@ buildscript {
         google()
         gradlePluginPortal()
     }
-    dependencies {
-        classpath("com.android.tools.build:gradle:7.3.1")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.22")
-    }
 }
 
 def isNewArchitectureEnabled() {
     return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
 }
 
+def getKotlinVersion() {
+    return project.plugins.findPlugin("kotlin-android")?.class?.package?.implementationVersion
+}
+
+def isKotlin2OrHigher() {
+    def kotlinVersion = getKotlinVersion()
+    if (kotlinVersion) {
+        def mainVersion = kotlinVersion.split('-')[0]
+        def versionParts = mainVersion.tokenize('.').collect { it.toInteger() }
+        return versionParts[0] >= 2
+    }
+    return false
+}
+
+def getComposeVersion() {
+    if (isKotlin2OrHigher()) {
+        def mainVersion = getKotlinVersion().split('-')[0]
+        return mainVersion
+    }
+    return gradle.ext.has("kotlinCompilerExtensionVersion") ? gradle.ext.kotlinCompilerExtensionVersion : "1.5.10"
+}
+
+if (isKotlin2OrHigher()) {
+    project.plugins.apply('org.jetbrains.kotlin.plugin.compose')
+}
+
 apply plugin: 'com.android.library'
 apply plugin: 'com.facebook.react'
 apply plugin: 'org.jetbrains.kotlin.android'
@@ -43,8 +65,10 @@ android {
         compose true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.10"
+    if (!isKotlin2OrHigher()) {
+        composeOptions {
+            kotlinCompilerExtensionVersion = getComposeVersion()
+        }
     }
 }
 
@@ -54,7 +78,7 @@ repositories {
 }
 
 dependencies {
-    implementation findProject(":camera") ?: "ly.img:camera:1.47.0"
+    implementation findProject(":camera") ?: "ly.img:camera:1.49.0"
     implementation platform("androidx.compose:compose-bom:2023.05.01")
     implementation "androidx.activity:activity-compose:1.6.1"
     implementation "androidx.activity:activity:1.7.0"

package/ios/IMGLYCameraModule.mm

@@ -26,12 +26,8 @@ RCT_EXPORT_MODULE(IMGLYCamera)
 }
 
 #else
-RCT_EXPORT_METHOD(openCamera
-                  : (nonnull NSDictionary*)settings video
-                  : (nullable NSString*)video metadata
-                  : (NSDictionary*)metadata resolve
-                  : (RCTPromiseResolveBlock)resolve reject
-                  : (RCTPromiseRejectBlock)reject) {
+RCT_EXPORT_METHOD(openCamera : (nonnull NSDictionary*)settings video : (nullable NSString*)video metadata : (
+  NSDictionary*)metadata resolve : (RCTPromiseResolveBlock)resolve reject : (RCTPromiseRejectBlock)reject) {
   [self open:settings video:video metadata:metadata resolve:resolve reject:reject];
 }
 #endif

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@imgly/camera-react-native",
-  "version": "1.47.0",
+  "version": "1.49.0",
   "description": "Camera SDK for React Native - provide a versatile video camera to your users on iOS and Android.",
   "react-native": "index.js",
   "source": "index.js",