react-native-scanbot-barcode-scanner-sdk 3.2.0-beta4 → 3.2.0-beta7

package/android/build/outputs/logs/manifest-merger-debug-report.txt

@@ -0,0 +1,37 @@
+-- Merging decision tree log ---
+manifest
+ADDED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+	package
+		ADDED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:2:11-61
+		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+	android:versionName
+		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+	android:versionCode
+		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:1-4:12
+		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+	xmlns:android
+		ADDED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml:1:11-69
+uses-sdk
+INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+	android:targetSdkVersion
+		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+	android:minSdkVersion
+		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/marcosaia/Work/Projects/Scanbot/ReactNative/scanbot-barcode-sdk-react-native/android/src/main/AndroidManifest.xml

package/android/build.gradle

@@ -1,76 +1,66 @@
 // android/build.gradle
 
-// based on:
-//
-// * https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle
-//   original location:
-//   - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/build.gradle
-//
-// * https://github.com/facebook/react-native/blob/0.60-stable/template/android/app/build.gradle
-//   original location:
-//   - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/app/build.gradle
-
 def DEFAULT_COMPILE_SDK_VERSION = 29
-def DEFAULT_BUILD_TOOLS_VERSION = '28.0.3'
 def DEFAULT_MIN_SDK_VERSION = 21
 def DEFAULT_TARGET_SDK_VERSION = 29
 
 def sdkVersion = '3.2.1'
 
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-}
-
-apply plugin: 'com.android.library'
-apply plugin: 'maven'
-
 buildscript {
-    // The Android Gradle plugin is only required when opening the android folder stand-alone.
-    // This avoids unnecessary downloads and potential conflicts when the library is included as a
-    // module dependency in an application project.
-    // ref: https://docs.gradle.org/current/userguide/tutorial_using_tasks.html#sec:build_script_external_dependencies
     if (project == rootProject) {
         repositories {
             google()
+            mavenCentral()
             jcenter()
         }
         dependencies {
-            classpath 'com.android.tools.build:gradle:3.4.1'
+            classpath 'com.android.tools.build:gradle:3.5.3'
         }
     }
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'maven'
+
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
-    buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
+    compileSdkVersion safeExtGet('ScanbotBarcodeScannerSdk_compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
-        targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
+        minSdkVersion safeExtGet('ScanbotBarcodeScannerSdk_minSdkVersion', DEFAULT_MIN_SDK_VERSION)
+        targetSdkVersion safeExtGet('ScanbotBarcodeScannerSdk_targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
         versionCode 1
         versionName "1.0"
     }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+
     lintOptions {
-        abortOnError false
+        disable 'GradleCompatible'
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
 repositories {
-    // ref: https://www.baeldung.com/maven-local-repository
     mavenLocal()
     maven {
         // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        url "$rootDir/../node_modules/react-native/android"
-    }
-    maven {
-        // Android JSC is installed from npm
-        url "$rootDir/../node_modules/jsc-android/dist"
+        url("$rootDir/../node_modules/react-native/android")
     }
     google()
+    mavenCentral()
     jcenter()
 
+    // Scanbot SDK Maven Repositories (NEXUS)
     maven {
         url 'https://nexus.scanbot.io/nexus/content/repositories/releases/'
     }
@@ -90,81 +80,6 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
     implementation 'com.google.android.material:material:1.0.0'
 
-//    implementation project(':scanbot-barcode-scanner-sdk')
-//    implementation project(':scanbot-barcode-scanner-sdk-ui')
     implementation "io.scanbot:scanbot-barcode-scanner-sdk:$sdkVersion"
     implementation "io.scanbot:scanbot-barcode-scanner-sdk-ui:$sdkVersion"
-}
-
-def configureReactNativePom(def pom) {
-    def packageJson = new groovy.json.JsonSlurper().parseText(file('../package.json').text)
-
-    pom.project {
-        name packageJson.title
-        artifactId packageJson.name
-        version = packageJson.version
-        group = "com.reactlibrary"
-        description packageJson.description
-        //url packageJson.repository.baseUrl
-
-        licenses {
-            license {
-                name packageJson.license
-                //url packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename
-                distribution 'repo'
-            }
-        }
-
-        developers {
-            developer {
-                id packageJson.author
-                name packageJson.author
-            }
-        }
-    }
-}
-
-afterEvaluate { project ->
-    // some Gradle build hooks ref:
-    // https://www.oreilly.com/library/view/gradle-beyond-the/9781449373801/ch03.html
-    task androidJavadoc(type: Javadoc) {
-        source = android.sourceSets.main.java.srcDirs
-        classpath += files(android.bootClasspath)
-        classpath += files(project.getConfigurations().getByName('compile').asList())
-        include '**/*.java'
-    }
-
-    task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) {
-        classifier = 'javadoc'
-        from androidJavadoc.destinationDir
-    }
-
-    task androidSourcesJar(type: Jar) {
-        classifier = 'sources'
-        from android.sourceSets.main.java.srcDirs
-        include '**/*.java'
-    }
-
-    android.libraryVariants.all { variant ->
-        def name = variant.name.capitalize()
-        def javaCompileTask = variant.javaCompileProvider.get()
-
-        task "jar${name}"(type: Jar, dependsOn: javaCompileTask) {
-            from javaCompileTask.destinationDir
-        }
-    }
-
-    artifacts {
-        archives androidSourcesJar
-        archives androidJavadocJar
-    }
-
-    task installArchives(type: Upload) {
-        configuration = configurations.archives
-        repositories.mavenDeployer {
-            // Deploy to react-native-event-bridge/maven, ready to publish to npm
-            repository url: "file://${projectDir}/../android/maven"
-            configureReactNativePom pom
-        }
-    }
-}
+}

package/ios/Utils/BarcodeMapping.h

@@ -25,6 +25,8 @@ static inline SBSDKBarcodeType* barcodeTypeFromString(NSString* string) {
     if ([string isEqualToString:@"UPC_A"]) return SBSDKBarcodeTypeUPCA;
     if ([string isEqualToString:@"UPC_E"]) return SBSDKBarcodeTypeUPCE;
     if ([string isEqualToString:@"MSI_PLESSEY"]) return SBSDKBarcodeTypeMSIPlessey;
+    if ([string isEqualToString:@"RSS_14"]) return SBSDKBarcodeTypeRSS14;
+    if ([string isEqualToString:@"RSS_EXPANDED"]) return SBSDKBarcodeTypeRSSExpanded;
     return nil;
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-scanbot-barcode-scanner-sdk",
   "title": "Scanbot Barcode Scanner SDK for React Native",
-  "version": "3.2.0-beta4",
+  "version": "3.2.0-beta7",
   "description": "Scanbot Barcode Scanner SDK React Native Plugin for Android and iOS",
   "main": "index.js",
   "files": [

package/ios/ScanbotBarcodeSdk.xcodeproj/xcuserdata/mayankpatil.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>ScanbotBarcodeSdk.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>