react-native-ux-cam 6.0.1 → 6.0.3

package/CHANGELOG.md

@@ -5,6 +5,8 @@
 
 Version | Changes
 ------- | ----------
+6.0.3  | Updated iOS SDK to 3.6.21 and Android to 3.6.37
+6.0.2  | Updated iOS SDK to 3.6.20 and Android to 3.6.36
 6.0.1  | Updated iOS SDK to 3.6.17 and Android to 3.6.33
 6.0.0  | Added support for new architecture
 5.4.16 | Updated iOS SDK to 3.6.13 and Android to 3.6.26

package/RNUxcam.podspec

@@ -1,6 +1,5 @@
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
-folly_version = '2024.01.01.00'
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 
 Pod::Spec.new do |s|
@@ -19,22 +18,28 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.static_framework = true
 
-  s.dependency 'React-Core'
-  s.dependency 'UXCam' , '~> 3.6.17'
+  s.dependency 'UXCam' , '~> 3.6.21'
 
-  # This guard prevent to install the dependencies when we run `pod install` in the old architecture.
-  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
-    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
-    s.pod_target_xcconfig    = {
+  if defined? install_modules_dependencies
+    # Default React Native dependencies for 0.71 and above (new and legacy architecture)
+    install_modules_dependencies(s)
+  else
+    s.dependency 'React-Core'
+
+    if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+      # New Architecture on React Native 0.70 and older
+      s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+      s.pod_target_xcconfig    = {
         "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
         "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
-    }
-  
-    s.dependency "React-Codegen"
-    s.dependency "RCT-Folly", folly_version
-    s.dependency "RCTRequired"
-    s.dependency "RCTTypeSafety"
-    s.dependency "ReactCommon/turbomodule/core"
+      }
+
+      s.dependency "React-Codegen"
+      s.dependency "RCT-Folly"
+      s.dependency "RCTRequired"
+      s.dependency "RCTTypeSafety"
+      s.dependency "ReactCommon/turbomodule/core"
+    end
   end
 
 end

package/android/build.gradle

@@ -69,7 +69,7 @@ rootProject.allprojects {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    implementation 'com.uxcam:uxcam:3.6.33'
+    implementation 'com.uxcam:uxcam:3.6.37'
 }
 
 if (isNewArchitectureEnabled()) {

package/android/src/main/java/com/uxcam/RNUxcamModuleImpl.java

@@ -42,6 +42,7 @@ public class RNUxcamModuleImpl {
     private static final String PARAM_ERROR_MESSAGE_KEY = "error";
 
     public static final String USER_APP_KEY = "userAppKey";
+    public static final String ENABLE_INTEGRATION_LOGGING = "enableIntegrationLogging";
     public static final String ENABLE_MUTLI_SESSION_RECORD = "enableMultiSessionRecord";
     public static final String ENABLE_CRASH_HANDLING = "enableCrashHandling";
     public static final String ENABLE_AUTOMATIC_SCREEN_NAME_TAGGING = "enableAutomaticScreenNameTagging";
@@ -56,7 +57,7 @@ public class RNUxcamModuleImpl {
     public static final String HIDE_GESTURES = "hideGestures";
 
     private static final String UXCAM_PLUGIN_TYPE = "react-native";
-    private static final String UXCAM_REACT_PLUGIN_VERSION = "6.0.1";
+    private static final String UXCAM_REACT_PLUGIN_VERSION = "6.0.3";
 
     private final ReactApplicationContext reactContext;
 
@@ -111,6 +112,7 @@ public class RNUxcamModuleImpl {
             return null;
          }
 
+         Boolean enableIntegrationLogging = (Boolean) configMap.get(ENABLE_INTEGRATION_LOGGING);
          Boolean enableMultiSessionRecord = (Boolean) configMap.get(ENABLE_MUTLI_SESSION_RECORD);
          Boolean enableCrashHandling = (Boolean) configMap.get(ENABLE_CRASH_HANDLING);
          Boolean enableAutomaticScreenNameTagging = (Boolean) configMap.get(ENABLE_AUTOMATIC_SCREEN_NAME_TAGGING);
@@ -122,6 +124,8 @@ public class RNUxcamModuleImpl {
              occlusionList = convertToOcclusionList(occlusionObjects);
          } 
          UXConfig.Builder uxConfigBuilder = new UXConfig.Builder(appKey);
+         if (enableIntegrationLogging != null)
+             uxConfigBuilder.enableIntegrationLogging(enableIntegrationLogging);
          if (enableMultiSessionRecord != null)
              uxConfigBuilder.enableMultiSessionRecord(enableMultiSessionRecord);
          if (enableCrashHandling != null)
@@ -406,6 +410,7 @@ public class RNUxcamModuleImpl {
                     switch (type) {
                         case Null:
                             convertedProperties.put(key, "");
+                            break;
                         case Boolean:
                             convertedProperties.put(key, properties.getBoolean(key));
                             break;

package/ios/RNUxcam/RNUxcam.mm

@@ -15,6 +15,7 @@ static NSString* const RNUxcam_VerifyEvent_Name = @"UXCam_Verification_Event";
 
 // Configuration Keys
 static NSString* const RNUxcam_AppKey = @"userAppKey";
+static NSString* const RNUxcam_IntegrationLogging = @"enableIntegrationLogging";
 static NSString* const RNUxcam_MultiSession = @"enableMultiSessionRecord";
 static NSString* const RNUxcam_CrashHandling = @"enableCrashHandling";
 static NSString* const RNUxcam_ScreenTag = @"enableAutomaticScreenNameTagging";
@@ -31,7 +32,7 @@ static NSString* const RNUxcam_HideGestures = @"hideGestures";
 static NSString* const RNUxcam_OverlayColor = @"color";
 
 static NSString* const RNUxcam_PluginType = @"react-native";
-static NSString* const RNUxcam_PluginVersion = @"6.0.1";
+static NSString* const RNUxcam_PluginVersion = @"6.0.3";
 
 
 @interface RNUxcam ()
@@ -86,6 +87,7 @@ RCT_EXPORT_METHOD(configurationForUXCam:(RCTPromiseResolveBlock)resolve
     {
         NSDictionary *configDict = @{
             RNUxcam_AppKey: configuration.userAppKey,
+            RNUxcam_IntegrationLogging: @(configuration.enableIntegrationLogging),
             RNUxcam_MultiSession: @(configuration.enableMultiSessionRecord),
             RNUxcam_CrashHandling: @(configuration.enableCrashHandling),
             RNUxcam_ScreenTag: @(configuration.enableAutomaticScreenNameTagging),
@@ -118,6 +120,11 @@ RCT_EXPORT_METHOD(updateConfiguration:(NSDictionary *)config)
 
 - (void)updateConfiguration:(UXCamConfiguration *)configuration fromDict:(NSDictionary *)config
 {
+     NSNumber *enableIntegrationLogging = config[RNUxcam_IntegrationLogging];
+    if (enableIntegrationLogging)
+    {
+        configuration.enableIntegrationLogging = [RCTConvert BOOL:enableIntegrationLogging];
+    }
     NSNumber *enableMultiSessionRecord = config[RNUxcam_MultiSession];
     if (enableMultiSessionRecord)
     {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-ux-cam",
-    "version": "6.0.1",
+    "version": "6.0.3",
     "description": "React Native wrapper for uxcam.com.",
     "react-native": "src/index",
     "main": "src/index",

package/src/types.ts

@@ -1,5 +1,6 @@
 export interface Configuration {
     userAppKey: string;
+    enableIntegrationLogging?: boolean;
     enableMultiSessionRecord?: boolean;
     enableCrashHandling?: boolean;
     enableAutomaticScreenNameTagging?: boolean;