New version of React Native CaptureSDK

Author: build

.npmignore

@@ -0,0 +1,4 @@
+yarn.lock
+#this us needed for compilation but not for the NPM package itself.
+src
+.npmrc

.npmrc

@@ -0,0 +1 @@
+//registry.npmjs.org/:_authToken=${NPM_TOKEN}

CHANGELOG.md

@@ -2,21 +2,37 @@
 
 This file tracks released versions with the changes made to this project.
 
+## Version 1.5.111
+
+### New
+
+- 🚀 React Native CaptureSDK is back to being public 🚀
+- Library name is changed back to `react-native-capture`
+
+### Improvements
+
+- Updated `react-native` to support `v0.75.4`.
+- Updated `react` to support `v18.3.1`.
+- Updated `socketmobile-capturejs` to `v1.3.50`.
+- Updated Gradle to support `v8.8` and new version of React Native.
+- Updated the [iOS CaptureSDK](https://github.com/SocketMobile/cocoapods-capturesdk) to `v1.9.74`.
+- Updated the Android CaptureSDK to `v1.8.21`.
+
 ## Version 1.5.86
 
 ### New
 
-- Added the support of SocketCam C820 or SocketCam C860 custom sized view on Android and iOS that the developer can import from `react-native-capturesdk`.
-- Added the `SocketCamViewContainer` component that the developer can import from `react-native-capturesdk`.
+- Added the support of SocketCam custom sized view on Android and iOS that the developer can import from `react-native-capture`.
+- Added the `SocketCamViewContainer` component that the developer can import from `react-native-capture`.
   - `SocketCamViewContainer` handles much of the SocketCam logic, like starting the SocketCam extension on Android, checking whether or not SocketCam is enabled, and setting the trigger type based on a provided value.
-- Added the first iteration of `CaptureHelper` that the developer can import from `react-native-capturesdk`.
+- Added the first iteration of `CaptureHelper` that the developer can import from `react-native-capture`.
   - `CaptureHelper` contains useful functions related to SocketCam for the developer to use so they no longer have to build them from scratch.
 - For Android: added a template for providing your own custom view, which includes a layout file to serve as the layout container for `SocketCamFragment`, as well as other Kotlin files specific to the custom view's package, view manager, custom view itself and the associated custom view activity. You can read more about custom views [here](https://docs.socketmobile.com/react-native-capture/en/latest/socketCamCustom.html).
 - Updated documentation to include information related to `SocketCamViewContainer`, how to implement custom views for Android and iOS, `CaptureHelper`, and how to enable/disable a symbology.
 
 ### Improvements
 
-- Removed any reference of/need for `NativeModules`, `DeviceEventEmitter`, getting whether or not SocketCam is enabled, or setting the SocketCam trigger from the example app. 
+- Removed any reference of/need for `NativeModules`, `DeviceEventEmitter`, getting whether or not SocketCam is enabled, or setting the SocketCam trigger from the example app.
   - Introduction of the`SocketCamViewContainer` component means the previous Native Module logic is now handled exclusively in the React Native CaptureSDK.
 
 ## Version 1.5.64

README.md

@@ -1,151 +1,110 @@
-// 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 = 28
-def DEFAULT_BUILD_TOOLS_VERSION = '28.0.3'
-def DEFAULT_MIN_SDK_VERSION = 16
-def DEFAULT_TARGET_SDK_VERSION = 28
-
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-}
-
-apply plugin: 'com.android.library'
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
 apply plugin: 'maven-publish'
 
 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()
-            jcenter()
-        }
-        dependencies {
-            classpath 'com.android.tools.build:gradle:4.2.0'
-        }
-    }
+  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
+  def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["CaptureSdk_kotlinVersion"]
+
+  repositories {
+    google()
+    mavenCentral()
+  }
+
+  dependencies {
+    classpath "com.android.tools.build:gradle:7.2.1"
+    // noinspection DifferentKotlinGradleVersion
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+  }
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'maven-publish'
+def reactNativeArchitectures() {
+  def value = rootProject.getProperties().get("reactNativeArchitectures")
+  return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
+}
 
-android {
-    compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
-    buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
-    defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
-        targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
-        versionCode 1
-        versionName "1.0"
-    }
-    lintOptions {
-        abortOnError false
-    }
+def isNewArchitectureEnabled() {
+  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
 }
 
-repositories {
-    // ref: https://www.baeldung.com/maven-local-repository
-    maven {
-        // Android JSC is installed from npm
-        url "$rootDir/../node_modules/jsc-android/dist"
-    }
-    mavenCentral()
-    google()
-    jcenter()
+if (isNewArchitectureEnabled()) {
+  apply plugin: "com.facebook.react"
 }
 
-dependencies {
-    //noinspection GradleDynamicVersion
-    // implementation fileTree(dir: "libs", include: ["*.aar", "*.jar"])
-    implementation 'com.facebook.react:react-native:+'  // From node_modules
-    implementation 'com.google.zxing:core:3.5.1'
-    implementation 'com.socketmobile:capture-socketcam:1.7.39'
+def getExtOrDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["CaptureSdk_" + name]
 }
 
-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.socketmobile"
-        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.username
-                name packageJson.author.name
-            }
-        }
-    }
+def getExtOrIntegerDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["CaptureSdk_" + name]).toInteger()
 }
 
-afterEvaluate { project ->
-    // some Gradle build hooks ref:
-    // https://www.oreilly.com/library/view/gradle-beyond-the/9781449373801/ch03.html
-    task androidJavadoc(type: Javadoc) {
-        configurations.implementation.canBeResolved = true
-        source = android.sourceSets.main.java.srcDirs
-        classpath += files(android.bootClasspath)
-        classpath += files(project.getConfigurations().getByName('implementation').asList())
-        include '**/*.java'
-    }
+def supportsNamespace() {
+  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+  def major = parsed[0].toInteger()
+  def minor = parsed[1].toInteger()
 
-    task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) {
-        classifier = 'javadoc'
-        from androidJavadoc.destinationDir
-    }
+  // Namespace support was added in 7.3.0
+  return (major == 7 && minor >= 3) || major >= 8
+}
+
+android {
+  if (supportsNamespace()) {
+    namespace "com.socketmobile"
 
-    task androidSourcesJar(type: Jar) {
-        classifier = 'sources'
-        from android.sourceSets.main.java.srcDirs
-        include '**/*.java'
+    sourceSets {
+      main {
+        manifest.srcFile "src/main/AndroidManifest.xml"
+      }
     }
+  }
 
-    android.libraryVariants.all { variant ->
-        def name = variant.name.capitalize()
-        def javaCompileTask = variant.javaCompileProvider.get()
+  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
-        task "jar${name}"(type: Jar, dependsOn: javaCompileTask) {
-            from javaCompileTask.destinationDir
-        }
-    }
+  defaultConfig {
+    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+
+  }
 
-    artifacts {
-        archives androidSourcesJar
-        archives androidJavadocJar
+  buildTypes {
+    release {
+      minifyEnabled false
     }
+  }
 
-    task installArchives(type: Upload) {
-        configuration = configurations.archives
-        publishing {
-            repositories {
-                maven {
-                    url = uri("${rootProject.projectDir}/maven-repo")
-                }
-            }
-        }
+  lintOptions {
+    disable "GradleCompatible"
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
+}
+
+def kotlin_version = getExtOrDefault("kotlinVersion")
+
+allprojects {
+  repositories {
+    mavenCentral()
+    google()
+    maven {
+      url "https://bin.socketmobile.com/repo/releases"
     }
+  }
+}
+
+dependencies {
+  // For < 0.71, this will be from the local maven repo
+  // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
+  //noinspection GradleDynamicVersion
+    implementation "com.facebook.react:react-native:+"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "com.google.zxing:core:3.5.1"
+    api "com.socketmobile:capture-socketcam:1.8.21"
 }
+
+
+
+

android/build.gradle

@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.socketmobile">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>