Skip to content

Commit eb473b7

Browse files
ian-wdian-wd
committed
feat: bump ios IDScan parser to v2.x
1 parent fde4062 commit eb473b7

File tree

37 files changed

+2016
-4562
lines changed

37 files changed

+2016
-4562
lines changed

‎example/Gemfile

+5-2
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,8 @@ source 'https://rubygems.org'
33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
44
ruby ">= 2.6.10"
55

6-
gem 'cocoapods', '~> 1.13'
7-
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
6+
# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
7+
# bound in the template on Cocoapods with next React Native release.
8+
gem 'cocoapods', '>= 1.13', '< 1.15'
9+
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
10+
gem 'xcodeproj', '< 1.26.0'

‎example/Gemfile.lock

+13-10
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ GEM
1010
i18n (>= 1.6, < 2)
1111
minitest (>= 5.1)
1212
tzinfo (~> 2.0)
13-
addressable (2.8.6)
14-
public_suffix (>= 2.0.2, < 6.0)
13+
addressable (2.8.7)
14+
public_suffix (>= 2.0.2, < 7.0)
1515
algoliasearch (1.27.5)
1616
httpclient (~> 2.8, >= 2.8.3)
1717
json (>= 1.5.1)
1818
atomos (0.1.3)
1919
base64 (0.2.0)
2020
claide (1.1.0)
21-
cocoapods (1.15.2)
21+
cocoapods (1.14.3)
2222
addressable (~> 2.8)
2323
claide (>= 1.0.2, < 2.0)
24-
cocoapods-core (= 1.15.2)
24+
cocoapods-core (= 1.14.3)
2525
cocoapods-deintegrate (>= 1.0.3, < 2.0)
2626
cocoapods-downloader (>= 2.1, < 3.0)
2727
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -36,7 +36,7 @@ GEM
3636
nap (~> 1.0)
3737
ruby-macho (>= 2.3.0, < 3.0)
3838
xcodeproj (>= 1.23.0, < 2.0)
39-
cocoapods-core (1.15.2)
39+
cocoapods-core (1.14.3)
4040
activesupport (>= 5.0, < 8)
4141
addressable (~> 2.8)
4242
algoliasearch (~> 1.0)
@@ -60,16 +60,18 @@ GEM
6060
escape (0.0.4)
6161
ethon (0.16.0)
6262
ffi (>= 1.15.0)
63-
ffi (1.16.3)
63+
ffi (1.17.2)
6464
fourflusher (2.3.1)
6565
fuzzy_match (2.0.4)
6666
gh_inspector (1.1.3)
67-
httpclient (2.8.3)
67+
httpclient (2.9.0)
68+
mutex_m
6869
i18n (1.14.1)
6970
concurrent-ruby (~> 1.0)
70-
json (2.7.2)
71+
json (2.11.3)
7172
minitest (5.19.0)
7273
molinillo (0.8.0)
74+
mutex_m (0.3.0)
7375
nanaimo (0.3.0)
7476
nap (1.1.0)
7577
netrc (0.11.0)
@@ -93,8 +95,9 @@ PLATFORMS
9395
ruby
9496

9597
DEPENDENCIES
96-
activesupport (>= 6.1.7.3, < 7.1.0)
97-
cocoapods (~> 1.13)
98+
activesupport (>= 6.1.7.5, < 7.1.0)
99+
cocoapods (>= 1.13, < 1.15)
100+
xcodeproj (< 1.26.0)
98101

99102
RUBY VERSION
100103
ruby 2.7.5p203

‎example/ios/IdscanSdkExample.xcodeproj/project.pbxproj

+78-25
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -16,7 +16,10 @@
1616
3CBD1EE228053C3200DEFBF9 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3CBD1EE128053C3200DEFBF9 /* AppDelegate.mm */; };
1717
3CBD1EE328053C3200DEFBF9 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3CBD1EE128053C3200DEFBF9 /* AppDelegate.mm */; };
1818
4C39C56BAD484C67AA576FFA /* libPods-IdscanSdkExample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CA3E69C5B9553B26FBA2DF04 /* libPods-IdscanSdkExample.a */; };
19+
714F88E72DCCB2240056922F /* IDScanIDParser in Frameworks */ = {isa = PBXBuildFile; productRef = 714F88E62DCCB2240056922F /* IDScanIDParser */; };
1920
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
21+
8A94EAE9DA2D9321822C8A17 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 99E308A178296E134CA05CD5 /* PrivacyInfo.xcprivacy */; };
22+
A37BD2B4C5BA0F0D8B8041C7 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 85CDABC7266782D45AD2F397 /* PrivacyInfo.xcprivacy */; };
2023
/* End PBXBuildFile section */
2124

2225
/* Begin PBXContainerItemProxy section */
@@ -64,6 +67,8 @@
6467
3CBD1EE128053C3200DEFBF9 /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = IdscanSdkExample/AppDelegate.mm; sourceTree = "<group>"; };
6568
47F7ED3B7971BE374F7B8635 /* Pods-IdscanSdkExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IdscanSdkExample.debug.xcconfig"; path = "Target Support Files/Pods-IdscanSdkExample/Pods-IdscanSdkExample.debug.xcconfig"; sourceTree = "<group>"; };
6669
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = IdscanSdkExample/LaunchScreen.storyboard; sourceTree = "<group>"; };
70+
85CDABC7266782D45AD2F397 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = IdscanSdkExample/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
71+
99E308A178296E134CA05CD5 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = IdscanSdkExample/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
6772
CA3E69C5B9553B26FBA2DF04 /* libPods-IdscanSdkExample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-IdscanSdkExample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
6873
E00ACF0FDA8BF921659E2F9A /* Pods-IdscanSdkExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IdscanSdkExample.release.xcconfig"; path = "Target Support Files/Pods-IdscanSdkExample/Pods-IdscanSdkExample.release.xcconfig"; sourceTree = "<group>"; };
6974
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
@@ -82,6 +87,7 @@
8287
isa = PBXFrameworksBuildPhase;
8388
buildActionMask = 2147483647;
8489
files = (
90+
714F88E72DCCB2240056922F /* IDScanIDParser in Frameworks */,
8591
4C39C56BAD484C67AA576FFA /* libPods-IdscanSdkExample.a in Frameworks */,
8692
);
8793
runOnlyForDeploymentPostprocessing = 0;
@@ -130,6 +136,7 @@
130136
13B07FB61A68108700A75B9A /* Info.plist */,
131137
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */,
132138
13B07FB71A68108700A75B9A /* main.m */,
139+
99E308A178296E134CA05CD5 /* PrivacyInfo.xcprivacy */,
133140
);
134141
name = IdscanSdkExample;
135142
sourceTree = "<group>";
@@ -169,6 +176,7 @@
169176
83CBBA001A601CBA00E9B192 /* Products */,
170177
2D16E6871FA4F8E400B85C8A /* Frameworks */,
171178
6B9684456A2045ADE5A6E47E /* Pods */,
179+
85CDABC7266782D45AD2F397 /* PrivacyInfo.xcprivacy */,
172180
);
173181
indentWidth = 2;
174182
sourceTree = "<group>";
@@ -328,6 +336,7 @@
328336
files = (
329337
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
330338
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
339+
8A94EAE9DA2D9321822C8A17 /* PrivacyInfo.xcprivacy in Resources */,
331340
);
332341
runOnlyForDeploymentPostprocessing = 0;
333342
};
@@ -336,6 +345,7 @@
336345
buildActionMask = 2147483647;
337346
files = (
338347
2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */,
348+
A37BD2B4C5BA0F0D8B8041C7 /* PrivacyInfo.xcprivacy in Resources */,
339349
);
340350
runOnlyForDeploymentPostprocessing = 0;
341351
};
@@ -414,8 +424,7 @@
414424
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
415425
"${PODS_XCFRAMEWORKS_BUILD_DIR}/react-native-idscan-sdk/IDScanPDFDetector.framework/IDScanPDFDetector",
416426
"${PODS_XCFRAMEWORKS_BUILD_DIR}/react-native-idscan-sdk/IDScanMRZDetector.framework/IDScanMRZDetector",
417-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/react-native-idscan-sdk/IDScanPDFParser.framework/IDScanPDFParser",
418-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/react-native-idscan-sdk/IDScanMRZParser.framework/IDScanMRZParser",
427+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/react-native-idscan-sdk/IDScanIDParserNative.framework/IDScanIDParserNative",
419428
);
420429
name = "[CP] Embed Pods Frameworks";
421430
outputPaths = (
@@ -425,8 +434,7 @@
425434
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
426435
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IDScanPDFDetector.framework",
427436
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IDScanMRZDetector.framework",
428-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IDScanPDFParser.framework",
429-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IDScanMRZParser.framework",
437+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IDScanIDParserNative.framework",
430438
);
431439
runOnlyForDeploymentPostprocessing = 0;
432440
shellPath = /bin/sh;
@@ -552,7 +560,11 @@
552560
);
553561
INFOPLIST_FILE = IdscanSdkExampleTests/Info.plist;
554562
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
555-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
563+
LD_RUNPATH_SEARCH_PATHS = (
564+
"$(inherited)",
565+
"@executable_path/Frameworks",
566+
"@loader_path/Frameworks",
567+
);
556568
OTHER_LDFLAGS = (
557569
"-ObjC",
558570
"-lc++",
@@ -571,7 +583,11 @@
571583
COPY_PHASE_STRIP = NO;
572584
INFOPLIST_FILE = IdscanSdkExampleTests/Info.plist;
573585
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
574-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
586+
LD_RUNPATH_SEARCH_PATHS = (
587+
"$(inherited)",
588+
"@executable_path/Frameworks",
589+
"@loader_path/Frameworks",
590+
);
575591
OTHER_LDFLAGS = (
576592
"-ObjC",
577593
"-lc++",
@@ -593,7 +609,10 @@
593609
DEVELOPMENT_TEAM = "";
594610
ENABLE_BITCODE = NO;
595611
INFOPLIST_FILE = IdscanSdkExample/Info.plist;
596-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
612+
LD_RUNPATH_SEARCH_PATHS = (
613+
"$(inherited)",
614+
"@executable_path/Frameworks",
615+
);
597616
MARKETING_VERSION = 1.0;
598617
OTHER_LDFLAGS = (
599618
"$(inherited)",
@@ -617,7 +636,10 @@
617636
CURRENT_PROJECT_VERSION = 1;
618637
DEVELOPMENT_TEAM = "";
619638
INFOPLIST_FILE = IdscanSdkExample/Info.plist;
620-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
639+
LD_RUNPATH_SEARCH_PATHS = (
640+
"$(inherited)",
641+
"@executable_path/Frameworks",
642+
);
621643
MARKETING_VERSION = 1.0;
622644
OTHER_LDFLAGS = (
623645
"$(inherited)",
@@ -644,7 +666,10 @@
644666
ENABLE_TESTABILITY = YES;
645667
GCC_NO_COMMON_BLOCKS = YES;
646668
INFOPLIST_FILE = "IdscanSdkExample-tvOS/Info.plist";
647-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
669+
LD_RUNPATH_SEARCH_PATHS = (
670+
"$(inherited)",
671+
"@executable_path/Frameworks",
672+
);
648673
OTHER_LDFLAGS = (
649674
"$(inherited)",
650675
"-ObjC",
@@ -671,7 +696,10 @@
671696
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
672697
GCC_NO_COMMON_BLOCKS = YES;
673698
INFOPLIST_FILE = "IdscanSdkExample-tvOS/Info.plist";
674-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
699+
LD_RUNPATH_SEARCH_PATHS = (
700+
"$(inherited)",
701+
"@executable_path/Frameworks",
702+
);
675703
OTHER_LDFLAGS = (
676704
"$(inherited)",
677705
"-ObjC",
@@ -697,7 +725,11 @@
697725
ENABLE_TESTABILITY = YES;
698726
GCC_NO_COMMON_BLOCKS = YES;
699727
INFOPLIST_FILE = "IdscanSdkExample-tvOSTests/Info.plist";
700-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
728+
LD_RUNPATH_SEARCH_PATHS = (
729+
"$(inherited)",
730+
"@executable_path/Frameworks",
731+
"@loader_path/Frameworks",
732+
);
701733
OTHER_LDFLAGS = (
702734
"$(inherited)",
703735
"-ObjC",
@@ -723,7 +755,11 @@
723755
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
724756
GCC_NO_COMMON_BLOCKS = YES;
725757
INFOPLIST_FILE = "IdscanSdkExample-tvOSTests/Info.plist";
726-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
758+
LD_RUNPATH_SEARCH_PATHS = (
759+
"$(inherited)",
760+
"@executable_path/Frameworks",
761+
"@loader_path/Frameworks",
762+
);
727763
OTHER_LDFLAGS = (
728764
"$(inherited)",
729765
"-ObjC",
@@ -786,7 +822,10 @@
786822
GCC_WARN_UNUSED_FUNCTION = YES;
787823
GCC_WARN_UNUSED_VARIABLE = YES;
788824
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
789-
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
825+
LD_RUNPATH_SEARCH_PATHS = (
826+
/usr/lib/swift,
827+
"$(inherited)",
828+
);
790829
LIBRARY_SEARCH_PATHS = (
791830
"$(SDKROOT)/usr/lib/swift",
792831
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
@@ -796,11 +835,7 @@
796835
ONLY_ACTIVE_ARCH = YES;
797836
OTHER_CFLAGS = "$(inherited)";
798837
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
799-
OTHER_LDFLAGS = (
800-
"$(inherited)",
801-
"-Wl",
802-
"-ld_classic",
803-
);
838+
OTHER_LDFLAGS = "$(inherited)";
804839
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
805840
SDKROOT = iphoneos;
806841
USE_HERMES = true;
@@ -849,7 +884,10 @@
849884
GCC_WARN_UNUSED_FUNCTION = YES;
850885
GCC_WARN_UNUSED_VARIABLE = YES;
851886
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
852-
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
887+
LD_RUNPATH_SEARCH_PATHS = (
888+
/usr/lib/swift,
889+
"$(inherited)",
890+
);
853891
LIBRARY_SEARCH_PATHS = (
854892
"$(SDKROOT)/usr/lib/swift",
855893
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
@@ -858,11 +896,7 @@
858896
MTL_ENABLE_DEBUG_INFO = NO;
859897
OTHER_CFLAGS = "$(inherited)";
860898
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
861-
OTHER_LDFLAGS = (
862-
"$(inherited)",
863-
"-Wl",
864-
"-ld_classic",
865-
);
899+
OTHER_LDFLAGS = "$(inherited)";
866900
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
867901
SDKROOT = iphoneos;
868902
USE_HERMES = true;
@@ -919,6 +953,25 @@
919953
defaultConfigurationName = Release;
920954
};
921955
/* End XCConfigurationList section */
956+
957+
/* Begin XCRemoteSwiftPackageReference section */
958+
714F88E52DCCB2240056922F /* XCRemoteSwiftPackageReference "IDScanIDParserIOS" */ = {
959+
isa = XCRemoteSwiftPackageReference;
960+
repositoryURL = "https://github.com/IDScanNet/IDScanIDParserIOS";
961+
requirement = {
962+
kind = upToNextMajorVersion;
963+
minimumVersion = 2.250513.1;
964+
};
965+
};
966+
/* End XCRemoteSwiftPackageReference section */
967+
968+
/* Begin XCSwiftPackageProductDependency section */
969+
714F88E62DCCB2240056922F /* IDScanIDParser */ = {
970+
isa = XCSwiftPackageProductDependency;
971+
package = 714F88E52DCCB2240056922F /* XCRemoteSwiftPackageReference "IDScanIDParserIOS" */;
972+
productName = IDScanIDParser;
973+
};
974+
/* End XCSwiftPackageProductDependency section */
922975
};
923976
rootObject = 83CBB9F71A601CBA00E9B192 /* Project object */;
924977
}

‎example/ios/IdscanSdkExample/PrivacyInfo.xcprivacy

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>NSPrivacyAccessedAPITypes</key>
6+
<array>
7+
<dict>
8+
<key>NSPrivacyAccessedAPIType</key>
9+
<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
10+
<key>NSPrivacyAccessedAPITypeReasons</key>
11+
<array>
12+
<string>C617.1</string>
13+
</array>
14+
</dict>
15+
<dict>
16+
<key>NSPrivacyAccessedAPIType</key>
17+
<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
18+
<key>NSPrivacyAccessedAPITypeReasons</key>
19+
<array>
20+
<string>CA92.1</string>
21+
</array>
22+
</dict>
23+
<dict>
24+
<key>NSPrivacyAccessedAPIType</key>
25+
<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
26+
<key>NSPrivacyAccessedAPITypeReasons</key>
27+
<array>
28+
<string>35F9.1</string>
29+
</array>
30+
</dict>
31+
</array>
32+
<key>NSPrivacyCollectedDataTypes</key>
33+
<array/>
34+
<key>NSPrivacyTracking</key>
35+
<false/>
36+
</dict>
37+
</plist>

0 commit comments

Comments
 (0)