Skip to content

Commit f422875

Browse files
plrthinkplrthink
authored
Merge pull request #144 from mockingbot/ios-zip-with-password
add Security.framework to rnpm link phase
2 parents b315174 + 75916ba commit f422875

File tree

2 files changed

+39
-38
lines changed

2 files changed

+39
-38
lines changed

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

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
2222
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
2323
146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
24-
2CA3C08170224BEA8E1EB054 /* libRNZipArchive.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B05F011E073435C87610E2B /* libRNZipArchive.a */; };
24+
15313B7DA36C455198C353C6 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 155E6D7878CC433D81990DE2 /* libz.tbd */; };
2525
319494D9F49D461984CA7D2B /* libDBCustomTabs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 02563868580D41E0AC0F0BD0 /* libDBCustomTabs.a */; };
26+
34078D34850249A988BB7A4F /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 09BE46B284BC40B69D89BD03 /* libiconv.tbd */; };
27+
589598AB3BCE4380876873C5 /* libRNZipArchive.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E888776BF1B64177B1C97845 /* libRNZipArchive.a */; };
2628
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
27-
8FA1AA7622B8ED4700B6D801 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8FA1AA7522B8ED4700B6D801 /* Security.framework */; };
28-
97C6C36C2E2947F09B857E60 /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 15E3E61C310D47FAB4964E0C /* libiconv.tbd */; };
2929
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
3030
B1E02DAFC3244F4492E73632 /* libRNFS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A8A06B3CBFF4903BA59A99D /* libRNFS.a */; };
3131
D70F33A64E71488992F0571A /* libRNDocumentPicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 21124052BD1C42B29932C41E /* libRNDocumentPicker.a */; };
3232
ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED297162215061F000B7C4FE /* JavaScriptCore.framework */; };
33-
F1FCBF6360CD466C9411A2D0 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 9309902FD20C47CD8AD937C8 /* libz.tbd */; };
33+
FA129D7273644334B55465DE /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 151AAE93F2A349FD87ED51A4 /* Security.framework */; };
3434
/* End PBXBuildFile section */
3535

3636
/* Begin PBXContainerItemProxy section */
@@ -258,20 +258,20 @@
258258
remoteGlobalIDString = 58B5119B1A9E6C1200147676;
259259
remoteInfo = RCTText;
260260
};
261-
8FA1AA7322B8ED3A00B6D801 /* PBXContainerItemProxy */ = {
262-
isa = PBXContainerItemProxy;
263-
containerPortal = 0EBC3EAD27B946F2AEAB4514 /* RNZipArchive.xcodeproj */;
264-
proxyType = 2;
265-
remoteGlobalIDString = D061F22A1E4887C4000350B4;
266-
remoteInfo = RNZipArchive;
267-
};
268261
8FEEE4FF22B8C6D30028BAEB /* PBXContainerItemProxy */ = {
269262
isa = PBXContainerItemProxy;
270263
containerPortal = 62380DDADCCE4A5EBF5806C9 /* ReactNativeCustomTabs.xcodeproj */;
271264
proxyType = 2;
272265
remoteGlobalIDString = DA7118681CC9158A0087DF95;
273266
remoteInfo = DBCustomTabs;
274267
};
268+
8FF00E9122BA0616003AECF4 /* PBXContainerItemProxy */ = {
269+
isa = PBXContainerItemProxy;
270+
containerPortal = 9FD746835D37461FB8323496 /* RNZipArchive.xcodeproj */;
271+
proxyType = 2;
272+
remoteGlobalIDString = D061F22A1E4887C4000350B4;
273+
remoteInfo = RNZipArchive;
274+
};
275275
ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */ = {
276276
isa = PBXContainerItemProxy;
277277
containerPortal = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */;
@@ -338,7 +338,7 @@
338338
00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = "../node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj"; sourceTree = "<group>"; };
339339
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = "../node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj"; sourceTree = "<group>"; };
340340
02563868580D41E0AC0F0BD0 /* libDBCustomTabs.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libDBCustomTabs.a; sourceTree = "<group>"; };
341-
0EBC3EAD27B946F2AEAB4514 /* RNZipArchive.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNZipArchive.xcodeproj; path = "../node_modules/react-native-zip-archive/ios/RNZipArchive.xcodeproj"; sourceTree = "<group>"; };
341+
09BE46B284BC40B69D89BD03 /* libiconv.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
342342
139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = "../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj"; sourceTree = "<group>"; };
343343
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = "../node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj"; sourceTree = "<group>"; };
344344
13B07F961A680F5B00A75B9A /* example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = example.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -349,21 +349,21 @@
349349
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = example/Info.plist; sourceTree = "<group>"; };
350350
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = example/main.m; sourceTree = "<group>"; };
351351
146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = "<group>"; };
352-
15E3E61C310D47FAB4964E0C /* libiconv.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
352+
151AAE93F2A349FD87ED51A4 /* Security.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
353+
155E6D7878CC433D81990DE2 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
353354
21124052BD1C42B29932C41E /* libRNDocumentPicker.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNDocumentPicker.a; sourceTree = "<group>"; };
354355
2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; };
355356
5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
356357
62380DDADCCE4A5EBF5806C9 /* ReactNativeCustomTabs.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = ReactNativeCustomTabs.xcodeproj; path = "../node_modules/react-native-custom-tabs/ios/ReactNativeCustomTabs.xcodeproj"; sourceTree = "<group>"; };
357-
6B05F011E073435C87610E2B /* libRNZipArchive.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNZipArchive.a; sourceTree = "<group>"; };
358358
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
359359
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
360360
8A8A06B3CBFF4903BA59A99D /* libRNFS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNFS.a; sourceTree = "<group>"; };
361-
8FA1AA7522B8ED4700B6D801 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
362361
910349A9C5884E88B21C0558 /* RNFS.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNFS.xcodeproj; path = "../node_modules/react-native-fs/RNFS.xcodeproj"; sourceTree = "<group>"; };
363-
9309902FD20C47CD8AD937C8 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
362+
9FD746835D37461FB8323496 /* RNZipArchive.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNZipArchive.xcodeproj; path = "../node_modules/react-native-zip-archive/ios/RNZipArchive.xcodeproj"; sourceTree = "<group>"; };
364363
ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
365364
D025710E222AFAC400FCA22C /* example.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = example.entitlements; path = example/example.entitlements; sourceTree = "<group>"; };
366365
E30BF4840B534983B566B463 /* RNDocumentPicker.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNDocumentPicker.xcodeproj; path = "../node_modules/react-native-document-picker/ios/RNDocumentPicker.xcodeproj"; sourceTree = "<group>"; };
366+
E888776BF1B64177B1C97845 /* libRNZipArchive.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNZipArchive.a; sourceTree = "<group>"; };
367367
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
368368
ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
369369
/* End PBXFileReference section */
@@ -373,7 +373,6 @@
373373
isa = PBXFrameworksBuildPhase;
374374
buildActionMask = 2147483647;
375375
files = (
376-
8FA1AA7622B8ED4700B6D801 /* Security.framework in Frameworks */,
377376
ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */,
378377
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */,
379378
11D1A2F320CAFA9E000508D9 /* libRCTAnimation.a in Frameworks */,
@@ -390,9 +389,10 @@
390389
D70F33A64E71488992F0571A /* libRNDocumentPicker.a in Frameworks */,
391390
B1E02DAFC3244F4492E73632 /* libRNFS.a in Frameworks */,
392391
319494D9F49D461984CA7D2B /* libDBCustomTabs.a in Frameworks */,
393-
2CA3C08170224BEA8E1EB054 /* libRNZipArchive.a in Frameworks */,
394-
F1FCBF6360CD466C9411A2D0 /* libz.tbd in Frameworks */,
395-
97C6C36C2E2947F09B857E60 /* libiconv.tbd in Frameworks */,
392+
589598AB3BCE4380876873C5 /* libRNZipArchive.a in Frameworks */,
393+
15313B7DA36C455198C353C6 /* libz.tbd in Frameworks */,
394+
34078D34850249A988BB7A4F /* libiconv.tbd in Frameworks */,
395+
FA129D7273644334B55465DE /* Security.framework in Frameworks */,
396396
);
397397
runOnlyForDeploymentPostprocessing = 0;
398398
};
@@ -502,12 +502,12 @@
502502
2D16E6871FA4F8E400B85C8A /* Frameworks */ = {
503503
isa = PBXGroup;
504504
children = (
505-
8FA1AA7522B8ED4700B6D801 /* Security.framework */,
506505
ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
507506
ED2971642150620600B7C4FE /* JavaScriptCore.framework */,
508507
2D16E6891FA4F8E400B85C8A /* libReact.a */,
509-
9309902FD20C47CD8AD937C8 /* libz.tbd */,
510-
15E3E61C310D47FAB4964E0C /* libiconv.tbd */,
508+
155E6D7878CC433D81990DE2 /* libz.tbd */,
509+
09BE46B284BC40B69D89BD03 /* libiconv.tbd */,
510+
151AAE93F2A349FD87ED51A4 /* Security.framework */,
511511
);
512512
name = Frameworks;
513513
sourceTree = "<group>";
@@ -548,7 +548,7 @@
548548
E30BF4840B534983B566B463 /* RNDocumentPicker.xcodeproj */,
549549
910349A9C5884E88B21C0558 /* RNFS.xcodeproj */,
550550
62380DDADCCE4A5EBF5806C9 /* ReactNativeCustomTabs.xcodeproj */,
551-
0EBC3EAD27B946F2AEAB4514 /* RNZipArchive.xcodeproj */,
551+
9FD746835D37461FB8323496 /* RNZipArchive.xcodeproj */,
552552
);
553553
name = Libraries;
554554
sourceTree = "<group>";
@@ -584,18 +584,18 @@
584584
name = Products;
585585
sourceTree = "<group>";
586586
};
587-
8FA1AA7022B8ED3A00B6D801 /* Products */ = {
587+
8FEEE4FC22B8C6D30028BAEB /* Products */ = {
588588
isa = PBXGroup;
589589
children = (
590-
8FA1AA7422B8ED3A00B6D801 /* libRNZipArchive.a */,
590+
8FEEE50022B8C6D30028BAEB /* libDBCustomTabs.a */,
591591
);
592592
name = Products;
593593
sourceTree = "<group>";
594594
};
595-
8FEEE4FC22B8C6D30028BAEB /* Products */ = {
595+
8FF00E8E22BA0615003AECF4 /* Products */ = {
596596
isa = PBXGroup;
597597
children = (
598-
8FEEE50022B8C6D30028BAEB /* libDBCustomTabs.a */,
598+
8FF00E9222BA0616003AECF4 /* libRNZipArchive.a */,
599599
);
600600
name = Products;
601601
sourceTree = "<group>";
@@ -615,7 +615,7 @@
615615
21124052BD1C42B29932C41E /* libRNDocumentPicker.a */,
616616
8A8A06B3CBFF4903BA59A99D /* libRNFS.a */,
617617
02563868580D41E0AC0F0BD0 /* libDBCustomTabs.a */,
618-
6B05F011E073435C87610E2B /* libRNZipArchive.a */,
618+
E888776BF1B64177B1C97845 /* libRNZipArchive.a */,
619619
);
620620
name = "Recovered References";
621621
sourceTree = "<group>";
@@ -752,8 +752,8 @@
752752
ProjectRef = 910349A9C5884E88B21C0558 /* RNFS.xcodeproj */;
753753
},
754754
{
755-
ProductGroup = 8FA1AA7022B8ED3A00B6D801 /* Products */;
756-
ProjectRef = 0EBC3EAD27B946F2AEAB4514 /* RNZipArchive.xcodeproj */;
755+
ProductGroup = 8FF00E8E22BA0615003AECF4 /* Products */;
756+
ProjectRef = 9FD746835D37461FB8323496 /* RNZipArchive.xcodeproj */;
757757
},
758758
);
759759
projectRoot = "";
@@ -988,18 +988,18 @@
988988
remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */;
989989
sourceTree = BUILT_PRODUCTS_DIR;
990990
};
991-
8FA1AA7422B8ED3A00B6D801 /* libRNZipArchive.a */ = {
991+
8FEEE50022B8C6D30028BAEB /* libDBCustomTabs.a */ = {
992992
isa = PBXReferenceProxy;
993993
fileType = archive.ar;
994-
path = libRNZipArchive.a;
995-
remoteRef = 8FA1AA7322B8ED3A00B6D801 /* PBXContainerItemProxy */;
994+
path = libDBCustomTabs.a;
995+
remoteRef = 8FEEE4FF22B8C6D30028BAEB /* PBXContainerItemProxy */;
996996
sourceTree = BUILT_PRODUCTS_DIR;
997997
};
998-
8FEEE50022B8C6D30028BAEB /* libDBCustomTabs.a */ = {
998+
8FF00E9222BA0616003AECF4 /* libRNZipArchive.a */ = {
999999
isa = PBXReferenceProxy;
10001000
fileType = archive.ar;
1001-
path = libDBCustomTabs.a;
1002-
remoteRef = 8FEEE4FF22B8C6D30028BAEB /* PBXContainerItemProxy */;
1001+
path = libRNZipArchive.a;
1002+
remoteRef = 8FF00E9122BA0616003AECF4 /* PBXContainerItemProxy */;
10031003
sourceTree = BUILT_PRODUCTS_DIR;
10041004
};
10051005
ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */ = {

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
"ios": {
2828
"sharedLibraries": [
2929
"libz",
30-
"libiconv"
30+
"libiconv",
31+
"Security.framework"
3132
]
3233
}
3334
},

0 commit comments

Comments
 (0)