scandit-react-native-datacapture-id 6.23.2 → 6.24.0-beta.2

package/android/build.gradle

@@ -1,13 +1,14 @@
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-}
+import com.android.Version
+
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
 
-def supportsNamespace() {
-    def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+static def supportsNamespace() {
+    def parsed = Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
     def major = parsed[0].toInteger()
     def minor = parsed[1].toInteger()
 
-    // Namespace support was added in 7.3.0
+    // Namespace support was added in AGP 7.3.0
     if (major == 7 && minor >= 3) {
         return true
     }
@@ -16,25 +17,28 @@ def supportsNamespace() {
 }
 
 buildscript {
-    ext {
-        kotlin_version = "1.7.21"
-        agp_version = "7.2.1"
+    // Simple helper that allows the root project to override versions declared by this library.
+    ext.safeExtGet = { prop, fallback -> rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback }
+
+    // Ensures backward compatibility
+    ext.getKotlinVersion = {
+        if (ext.has("kotlinVersion")) {
+            ext.kotlinVersion()
+        } else {
+            ext.safeExtGet("kotlinVersion", "1.7.21")
+        }
     }
 
     repositories {
-        google()
         mavenCentral()
+        google()
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:$agp_version"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
     }
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-
 android {
     if (supportsNamespace()) {
         sourceSets {
@@ -44,11 +48,12 @@ android {
         }
         namespace "com.scandit.datacapture.reactnative.id"
     }
-    compileSdkVersion safeExtGet('compileSdkVersion', 32)
+
+    compileSdkVersion safeExtGet("compileSdkVersion", 33)
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 23)
-        targetSdkVersion safeExtGet('targetSdkVersion', 32)
+        minSdkVersion safeExtGet("minSdkVersion", 23)
+        targetSdkVersion safeExtGet("targetSdkVersion", 33)
         versionCode 1
         versionName "1.0"
     }
@@ -59,7 +64,7 @@ android {
 }
 
 dependencies {
-    def sdk_version = "6.23.2"
+    def sdk_version = "6.24.0-beta.2"
 
     println("Version of the native sdk used in this build: ${safeExtGet('global_sdk_version', sdk_version)}")
     if (findProject(':scandit-datacapture-frameworks-id') != null) {

package/dist/id.js

@@ -557,6 +557,7 @@ class CommonCapturedIdFields {
     get firstName() { return this.json.firstName; }
     get lastName() { return this.json.lastName; }
     get fullName() { return this.json.fullName; }
+    get secondaryLastName() { return this.json.secondaryLastName; }
     get sex() { return this.json.sex; }
     get dateOfBirth() {
         return DateResult.fromJSON(this.json.dateOfBirth);
@@ -583,6 +584,7 @@ class CommonCapturedIdFields {
         const firstName = json.firstName;
         const lastName = json.lastName;
         const fullName = json.fullName;
+        const secondaryLastName = json.secondaryLastName;
         const sex = json.sex;
         const dateOfBirth = DateResult.fromJSON(json.dateOfBirth);
         const age = json.age;
@@ -605,6 +607,9 @@ class CommonCapturedIdFields {
             if (!existingInstance.fullName) {
                 json.fullName = fullName;
             }
+            if (!existingInstance.secondaryLastName) {
+                json.secondaryLastName = secondaryLastName;
+            }
             if (!existingInstance.sex) {
                 json.sex = sex;
             }
@@ -696,6 +701,7 @@ class CapturedId {
     get firstName() { return this.commonCapturedFields.firstName; }
     get lastName() { return this.commonCapturedFields.lastName; }
     get fullName() { return this.commonCapturedFields.fullName; }
+    get secondaryLastName() { return this.commonCapturedFields.secondaryLastName; }
     get sex() { return this.commonCapturedFields.sex; }
     get dateOfBirth() {
         return DateResult.fromJSON(this.commonCapturedFields.dateOfBirth);