Merge pull request #37 from getyoti/release/DEP-438-2.0.2

[Task] DEP-438: RN 2.0.2
getyoti · Nov 17, 2023 · 11f987d · 11f987d
2 parents d54b451 + d4a625e
commit 11f987d
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 109 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ To integrate with Yoti IDV, a working infrastructure is needed (see [developers.
 Start your integration by adding the following dependency to your `package.json` file:
 ```json
 "dependencies": {
-    "@getyoti/yoti-doc-scan-react-native": "^2.0.1"
+    "@getyoti/yoti-doc-scan-react-native": "^2.0.2"
 }
 ```
 

diff --git a/android/build.gradle b/android/build.gradle
@@ -11,8 +11,8 @@ android {
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 21)
         targetSdkVersion safeExtGet('targetSdkVersion', 29)
-        versionCode 205
-        versionName "2.0.1"
+        versionCode 206
+        versionName "2.0.2"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }

diff --git a/example/ios/Demo.xcodeproj/project.pbxproj b/example/ios/Demo.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 53;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -202,57 +202,8 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 6VUTP72GG4;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/DoubleConversion\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/RCT-Folly\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/RCTTypeSafety\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-Core\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-CoreModules\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTAnimation\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTBlob\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTImage\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTLinking\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTNetwork\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTSettings\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTText\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTVibration\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-jsi\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-jsiexecutor\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-jsinspector\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-logger\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-perflogger\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/SwiftProtobuf\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/Yoga\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/fmt\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/glog\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/yoti-doc-scan-react-native\"",
-					"\"${PODS_ROOT}/PPBlinkID\"",
-					"\"${PODS_ROOT}/YotiDocumentCapture/YotiDocumentCapture\"",
-					"\"${PODS_ROOT}/YotiFoundation/YotiFoundation\"",
-					"\"${PODS_ROOT}/YotiNetwork/YotiNetwork\"",
-					"\"${PODS_ROOT}/YotiSDKCommon/YotiSDKCommon\"",
-					"\"${PODS_ROOT}/YotiSDKCore/YotiSDKCore\"",
-					"\"${PODS_ROOT}/YotiSDKDesign/YotiSDKDesign\"",
-					"\"${PODS_ROOT}/YotiSDKDocument/YotiSDKDocument\"",
-					"\"${PODS_ROOT}/YotiSDKFace/YotiSDKFace\"",
-					"\"${PODS_ROOT}/YotiSDKFaceTec/YotiSDKFaceTec\"",
-					"\"${PODS_ROOT}/YotiSDKNetwork/YotiSDKNetwork\"",
-					"\"${PODS_XCFRAMEWORKS_BUILD_DIR}/YotiCommon\"",
-					"\"${PODS_XCFRAMEWORKS_BUILD_DIR}/YotiDocumentCapture\"",
-					"\"${PODS_XCFRAMEWORKS_BUILD_DIR}/YotiFoundation\"",
-					"\"${PODS_XCFRAMEWORKS_BUILD_DIR}/YotiNetwork\"",
-					"\"${PODS_XCFRAMEWORKS_BUILD_DIR}/YotiSDKCommon\"",
-					"\"${PODS_XCFRAMEWORKS_BUILD_DIR}/YotiSDKCore\"",
-					"\"${PODS_XCFRAMEWORKS_BUILD_DIR}/YotiSDKDesign\"",
-					"\"${PODS_XCFRAMEWORKS_BUILD_DIR}/YotiSDKDocument\"",
-					"\"${PODS_XCFRAMEWORKS_BUILD_DIR}/YotiSDKFace\"",
-					"\"${PODS_XCFRAMEWORKS_BUILD_DIR}/YotiSDKFaceTec\"",
-					"\"${PODS_XCFRAMEWORKS_BUILD_DIR}/YotiSDKNetwork\"",
-				);
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
+				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = Demo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -287,6 +238,8 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 6VUTP72GG4;
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
+				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = Demo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (

diff --git a/example/ios/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme b/example/ios/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme
@@ -3,23 +3,9 @@
    LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
-      parallelizeBuildables = "NO"
+      parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "83CBBA2D1A601D0E00E9B192"
-               BuildableName = "libReact.a"
-               BlueprintName = "React"
-               ReferencedContainer = "container:../node_modules/react-native/React/React.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
@@ -34,20 +20,6 @@
                ReferencedContainer = "container:Demo.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "00E356ED1AD99517003FC87E"
-               BuildableName = "exampleTests.xctest"
-               BlueprintName = "exampleTests"
-               ReferencedContainer = "container:Demo.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -65,16 +37,6 @@
          </BuildableReference>
       </MacroExpansion>
       <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "00E356ED1AD99517003FC87E"
-               BuildableName = "exampleTests.xctest"
-               BlueprintName = "exampleTests"
-               ReferencedContainer = "container:Demo.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
     "license": "https://www.yoti.com/terms/identity-verification",
     "author": "Yoti Ltd",
     "main": "RNYotiDocScan.js",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "devDependencies": {
         "react": "^17.0.2",
         "react-dom": "^17.0.2",

diff --git a/yoti-doc-scan-react-native.podspec b/yoti-doc-scan-react-native.podspec
@@ -3,18 +3,27 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
 Pod::Spec.new do |spec|
-  spec.name                 = "yoti-doc-scan-react-native"
-  spec.summary              = package["description"]
-  spec.homepage             = package["homepage"]
-  spec.license              = package["license"]
-  spec.author               = package["author"]
-  spec.version              = package["version"]
-  spec.pod_target_xcconfig  = { "FRAMEWORK_SEARCH_PATHS" => "$(PODS_ROOT)/**" "$(PODS_XCFRAMEWORKS_BUILD_DIR)/**" }
-  spec.source               = { :git => "https://github.com/getyoti/yoti-doc-scan-react-native.git", :tag => "#{spec.version}" }
-  spec.source_files         = "ios/**/*.{h,m}"
-  spec.platform             = :ios, "11.0"
-  spec.dependency           "React"
-  spec.dependency           "YotiSDKNetwork"
-  spec.dependency           "YotiSDKCommon"
-  spec.dependency           "YotiSDKCore"
+  spec.name = "yoti-doc-scan-react-native"
+  spec.summary = package["description"]
+  spec.homepage = package["homepage"]
+  spec.license = package["license"]
+  spec.author = package["author"]
+  spec.version = package["version"]
+  spec.pod_target_xcconfig = {
+    "FRAMEWORK_SEARCH_PATHS" => [
+      "${PODS_XCFRAMEWORKS_BUILD_DIR}/YotiSDKIdentityDocument",
+      "${PODS_XCFRAMEWORKS_BUILD_DIR}/YotiSDKSupplementaryDocument",
+      "${PODS_XCFRAMEWORKS_BUILD_DIR}/YotiSDKFaceTec",
+      "${PODS_XCFRAMEWORKS_BUILD_DIR}/YotiSDKFaceCapture"
+    ]
+  }
+  spec.source = {
+    :git => "https://github.com/getyoti/yoti-doc-scan-react-native.git", :tag => "#{spec.version}"
+  }
+  spec.source_files = "ios/**/*.{h,m}"
+  spec.platform = :ios, "11.0"
+  spec.dependency "React"
+  spec.dependency "YotiSDKNetwork"
+  spec.dependency "YotiSDKCommon"
+  spec.dependency "YotiSDKCore"
 end