Skip to content

Commit

Permalink
Merge pull request #6 from getyoti/task/YD-2315-SupportLatestNativeVe…
Browse files Browse the repository at this point in the history
…rsion

[Task] YD-2315: Support v2.4.0 of the SDK
  • Loading branch information
mariasenosiain authored Oct 30, 2020
2 parents 67bf35b + 048bfd0 commit 881b9e4
Show file tree
Hide file tree
Showing 8 changed files with 129 additions and 68 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.lock
9 changes: 5 additions & 4 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ android {
}
}

buildTypes {
buildTypes {
debug {
matchingFallbacks = ['release']
}
Expand All @@ -38,8 +38,9 @@ android {
dependencies {
//noinspection GradleDynamicVersion
implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
implementation 'com.yoti.mobile.android.sdk:yoti-sdk-doc-scan:2.3.2'
implementation 'com.yoti.mobile.android.sdk:yoti-sdk-liveness-zoom:2.3.2'
implementation 'com.yoti.mobile.android.sdk:yoti-sdk-doc-scan:2.4.0'
implementation 'com.yoti.mobile.android.sdk:yoti-sdk-doc-scan-sup:2.4.0'
implementation 'com.yoti.mobile.android.sdk:yoti-sdk-liveness-zoom:2.4.0'
}

allprojects {
Expand All @@ -48,4 +49,4 @@ allprojects {
maven { url 'https://maven.microblink.com' }
maven { url "https://jitpack.io" }
}
}
}
9 changes: 0 additions & 9 deletions example/ios/File.swift

This file was deleted.

8 changes: 2 additions & 6 deletions example/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
platform :ios, '11.4'
platform :ios, '11.0'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'

target 'example' do
# Pods for example
pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector"
pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec"
pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired"
Expand Down Expand Up @@ -39,16 +38,13 @@ target 'example' do
# Pods for testing
end

use_frameworks!
use_native_modules!

end

target 'example-tvOS' do
# Pods for example-tvOS

target 'example-tvOSTests' do
inherit! :search_paths
# Pods for testing
end

end
114 changes: 86 additions & 28 deletions example/ios/example.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

14 changes: 10 additions & 4 deletions example/ios/example/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSCameraUsageDescription</key>
<string>Enable camera access so that you can scan an identity document.</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>Yoti Doc Scan Example</string>
<string>$(PRODUCT_NAME)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
Expand All @@ -19,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -39,6 +37,8 @@
</array>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NFCReaderUsageDescription</key>
<string>NFC is used when scanning a passport.</string>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
Expand All @@ -52,6 +52,8 @@
</dict>
</dict>
</dict>
<key>NSCameraUsageDescription</key>
<string>Enable camera access so that you can scan an identity document.</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string></string>
<key>UIAppFonts</key>
Expand Down Expand Up @@ -90,5 +92,9 @@
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>com.apple.developer.nfc.readersession.iso7816.select-identifiers</key>
<array>
<string>A0000002471001</string>
</array>
</dict>
</plist>
11 changes: 11 additions & 0 deletions example/ios/example/example.entitlements
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?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>com.apple.developer.nfc.readersession.formats</key>
<array>
<string>NDEF</string>
<string>TAG</string>
</array>
</dict>
</plist>
31 changes: 14 additions & 17 deletions react-native-yoti-doc-scan.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,18 @@ require "json"

package = JSON.parse(File.read(File.join(__dir__, "package.json")))

Pod::Spec.new do |s|
s.name = 'react-native-yoti-doc-scan'
s.version = package['version']
s.summary = package['description']
s.description = package['description']
s.license = package['license']
s.author = package['author']
s.homepage = 'https://github.com/getyoti/yoti-doc-scan-react-native'
s.source = { :git => "https://github.com/getyoti/yoti-doc-scan-react-native.git", :tag => "#{s.version}" }
s.source_files = 'ios/**/*.{h,m}'
s.platform = :ios, '11.4'
s.dependency 'React'
s.dependency 'YotiSDKDocument','2.1.1'
s.dependency 'YotiSDKZoom','2.1.1'
s.pod_target_xcconfig = {
'CLANG_ENABLE_MODULES' => 'NO'
}
Pod::Spec.new do |spec|
spec.name = "react-native-yoti-doc-scan"
spec.version = package["version"]
spec.summary = package["description"]
spec.description = package["description"]
spec.license = package["license"]
spec.author = package["author"]
spec.homepage = "https://github.com/getyoti/yoti-doc-scan-react-native"
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 "YotiSDKDocument", "2.4.0"
spec.dependency "YotiSDKZoom", "2.4.0"
end

0 comments on commit 881b9e4

Please sign in to comment.