react-native-scanbot-barcode-scanner-sdk 3.6.0 → 3.6.1-alpha.1

package/RNScanbotBarcodeSDK.podspec

@@ -1,24 +1,27 @@
+# AUTOGENERATED: DO NOT MODIFY MANUALLY 
+
 require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 ScanbotBarcodeScannerSDKVersion = '3.6.0'
 
-package = JSON.parse(File.read(File.join(__dir__, "package.json")))
-
 Pod::Spec.new do |s|
   s.name         = "RNScanbotBarcodeSDK"
-  s.version           = package['version']
-  s.summary           = package['description']
-  s.homepage          = package['homepage']
-  s.authors           = package['author']
+  s.version      = package['version']
+  s.summary      = package['description']
+  s.homepage     = package['homepage']
+  s.authors      = package['author']
   s.license      = { :type => 'Commercial' }
   s.platforms    = { :ios => "9.0" }
-  s.source       = { :http => 'https://download.scanbot.io/barcode-scanner-sdk/react-native/react-native-scanbot-barcode-scanner-sdk-' + package['version'] + '.tgz' }
 
+  
+  s.source = { :http => 'https://download.scanbot.io/barcode-scanner-sdk/react-native/react-native-scanbot-barcode-scanner-sdk-' + package['version'] + '.tgz' }    
   s.source_files = "ios/**/*.{h,m,swift}"
   s.requires_arc = true
 
+  install_modules_dependencies(s)
+
   s.dependency "React"
   s.dependency "ScanbotBarcodeScannerSDK", ScanbotBarcodeScannerSDKVersion
 

package/android/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Thu Apr 20 12:17:41 CEST 2023
-gradle.version=7.1.1
+#Wed Aug 23 17:42:42 CEST 2023
+gradle.version=7.4

package/android/build.gradle

@@ -6,25 +6,28 @@ def DEFAULT_TARGET_SDK_VERSION = 31
 
 def sdkVersion = '3.6.0'
 
-buildscript {
-    if (project == rootProject) {
-        repositories {
-            google()
-            mavenCentral()
-            jcenter()
-        }
-        dependencies {
-            classpath 'com.android.tools.build:gradle:3.5.3'
-        }
-    }
+def isNewArchitectureEnabled = {
+    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
 }
 
-apply plugin: 'com.android.library'
-
-def safeExtGet(prop, fallback) {
+buildscript {
+  ext.safeExtGet = {prop, fallback ->
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+  }
+  repositories {
+    google()
+    gradlePluginPortal()
+    jcenter()
+    mavenCentral()
+  }
+  dependencies {
+    classpath("com.android.tools.build:gradle:7.3.1")
+  }
 }
 
+apply plugin: 'com.android.library'
+apply plugin: 'com.facebook.react'
+
 android {
     compileSdkVersion safeExtGet('ScanbotBarcodeScannerSdk_compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
     defaultConfig {
@@ -32,6 +35,17 @@ android {
         targetSdkVersion safeExtGet('ScanbotBarcodeScannerSdk_targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
         versionCode 1
         versionName "1.0"
+        buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString())
+    }
+
+    sourceSets {
+        main {
+            if (isNewArchitectureEnabled()) {
+                java.srcDirs += ['src/main', 'src/new-architecture']
+            } else {
+                java.srcDirs += ['src/main', 'src/old-architecture']
+            }
+        }
     }
 
     buildTypes {
@@ -43,21 +57,12 @@ android {
     lintOptions {
         disable 'GradleCompatible'
     }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
 }
 
 repositories {
     mavenLocal()
-    maven {
-        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        url("$rootDir/../node_modules/react-native/android")
-    }
-    google()
     mavenCentral()
+    google()
     jcenter()
 
     // Scanbot SDK Maven Repositories (NEXUS)
@@ -70,8 +75,7 @@ repositories {
 }
 
 dependencies {
-    //noinspection GradleDynamicVersion
-    implementation 'com.facebook.react:react-native:+'  // From node_modules
+    implementation 'com.facebook.react:react-native'
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.1.0'

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="io.scanbot.barcodesdk.plugin.reactnative">
+<manifest package="io.scanbot.barcodesdk.plugin.reactnative">
 
 </manifest>

package/android/src/main/java/com/reactlibrary/ScanbotBarcodeSdkModule.java

@@ -1,24 +1,17 @@
 /*
   Scanbot Barcode Scanner SDK React Native Plugin
-  Copyright (c) 2020 doo GmbH. All rights reserved.
+  Copyright (c) 2023 Scanbot SDK GmbH. All rights reserved.
   https://scanbot.io/sdk
  */
 package com.reactlibrary;
 
-import com.facebook.react.bridge.ReactApplicationContext;
+import androidx.annotation.NonNull;
+
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.Callback;
 
+/** @noinspection unused*/
 public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule {
-
-    private final ReactApplicationContext reactContext;
-
-    public ScanbotBarcodeSdkModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-        this.reactContext = reactContext;
-    }
-
+    @NonNull
     @Override
     public String getName() {
         return "ScanbotBarcodeSdk";

package/android/src/main/java/com/reactlibrary/ScanbotBarcodeSdkPackage.java

@@ -1,13 +1,12 @@
 /*
   Scanbot Barcode Scanner SDK React Native Plugin
-  Copyright (c) 2020 doo GmbH. All rights reserved.
+  Copyright (c) 2023 Scanbot SDK GmbH. All rights reserved.
   https://scanbot.io/sdk
  */
 package com.reactlibrary;
 
 import androidx.annotation.NonNull;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -19,6 +18,7 @@ import com.facebook.react.uimanager.ViewManager;
 import io.scanbot.barcodesdk.plugin.reactnative.ScanbotBarcodeSdkModule;
 import io.scanbot.barcodesdk.plugin.reactnative.components.barcodecameraview.ScanbotBarcodeCameraViewManager;
 
+/** @noinspection unused*/
 public class ScanbotBarcodeSdkPackage implements ReactPackage {
     @NonNull
     @Override

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/ObjectMapper.java

@@ -1,6 +1,6 @@
 /*
   Scanbot Barcode Scanner SDK React Native Plugin
-  Copyright (c) 2020 doo GmbH. All rights reserved.
+  Copyright (c) 2023 Scanbot SDK GmbH. All rights reserved.
   https://scanbot.io/sdk
  */
 package io.scanbot.barcodesdk.plugin.reactnative;
@@ -17,7 +17,7 @@ import java.util.Map;
 import io.scanbot.sdk.ui.camera.FinderAspectRatio;
 
 public final class ObjectMapper {
-    private static Map<String, Map<String, Method>> methodCache = new HashMap<>();
+    private static final Map<String, Map<String, Method>> methodCache = new HashMap<>();
 
     private static Map<String, Map<String, String>> enumMappings;
 
@@ -44,7 +44,7 @@ public final class ObjectMapper {
         ObjectMapper.enumMappings = enumMappings;
     }
 
-    @SuppressWarnings({"unchecked", "SuspiciousMethodCalls", "rawtypes", "ConstantConditions"})
+    @SuppressWarnings({"unchecked", "SuspiciousMethodCalls", "rawtypes"})
     private static void map(final Map<String, Object> source, final Object target)
             throws IllegalAccessException, InvocationTargetException {
         final Class cls = target.getClass();
@@ -93,22 +93,33 @@ public final class ObjectMapper {
 
                 if (enumMappings != null && enumMappings.containsKey(prop)) {
                     Map<String, String> enumNames = enumMappings.get(prop);
-                    if (enumNames.containsKey(value)) {
+                    if (enumNames != null && enumNames.containsKey(value)) {
                         value = enumNames.get(value);
                     }
                 }
 
                 if (setterName.equals("setFinderAspectRatio")) {
-                    Map<String, Object> pointMap = (Map<String, Object>) value;
-                    int x = ((Number) pointMap.get("width")).intValue();
-                    int y = ((Number) pointMap.get("height")).intValue();
-                    setter.invoke(target, new FinderAspectRatio(x, y));
+                    final Map<String, Object> pointMap = (Map<String, Object>) value;
+                    if (pointMap != null) {
+                        final Object widthObj = pointMap.get("width");
+                        final Object heightObj = pointMap.get("width");
+                        if (widthObj != null && heightObj != null) {
+                            int x = ((Number) widthObj).intValue();
+                            int y = ((Number) heightObj).intValue();
+                            // TODO: FinderAspectRatio is deprecated
+                            setter.invoke(target, new FinderAspectRatio(x, y));
+                        }
+                    }
                 } else if (setter.getParameterTypes().length == 2 && value instanceof Map) {
-                    // map Size to a binary function
-                    Map<String, Object> pointMap = (Map<String, Object>) value;
-                    int x = ((Number) pointMap.get("width")).intValue();
-                    int y = ((Number) pointMap.get("height")).intValue();
-                    setter.invoke(target, x, y);
+                    final Map<String, Object> pointMap = (Map<String, Object>) value;
+                    final Object widthObj = pointMap.get("width");
+                    final Object heightObj = pointMap.get("width");
+                    if (widthObj != null && heightObj != null) {
+                        int x = ((Number) widthObj).intValue();
+                        int y = ((Number) heightObj).intValue();
+                        // TODO: FinderAspectRatio is deprecated
+                        setter.invoke(target, new FinderAspectRatio(x, y));
+                    }
                 } else {
                     final Class paramType = setter.getParameterTypes()[0];
                     if (setterName.contains("Color")) {
@@ -122,7 +133,7 @@ public final class ObjectMapper {
                     } else if (paramType == double.class) {
                         assert value instanceof Number;
                         value = ((Number) value).doubleValue();
-                    } else if (paramType.isEnum()) {
+                    } else if (paramType.isEnum() && value != null) {
                         try {
                             value = Enum.valueOf(paramType, (String) value);
                         } catch (final Exception ignored) {

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/ScanbotBarcodeSdkConfiguration.java

@@ -1,10 +1,13 @@
 /*
   Scanbot Barcode Scanner SDK React Native Plugin
-  Copyright (c) 2020 doo GmbH. All rights reserved.
+  Copyright (c) 2023 Scanbot SDK GmbH. All rights reserved.
   https://scanbot.io/sdk
  */
 package io.scanbot.barcodesdk.plugin.reactnative;
 
+// The following noinspection rule has been introduced since
+// methods in this class are called through reflection
+/** @noinspection unused*/
 public class ScanbotBarcodeSdkConfiguration {
     private boolean loggingEnabled = false;
     private boolean enableNativeLogging = false;