Skip to content

Commit cb84d6f

Browse files
semirpsemirp
committed
fix: use correct path for dynamically linked frameworks
1 parent 491cddd commit cb84d6f

File tree

5 files changed

+33
-18
lines changed

5 files changed

+33
-18
lines changed

‎example/ios/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PODS:
88
- hermes-engine (0.81.1):
99
- hermes-engine/Pre-built (= 0.81.1)
1010
- hermes-engine/Pre-built (0.81.1)
11-
- primer-io-react-native (2.39.0):
11+
- primer-io-react-native (2.39.1):
1212
- boost
1313
- DoubleConversion
1414
- fast_float
@@ -2694,7 +2694,7 @@ SPEC CHECKSUMS:
26942694
fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
26952695
glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
26962696
hermes-engine: 4f8246b1f6d79f625e0d99472d1f3a71da4d28ca
2697-
primer-io-react-native: 5f689cd526607e5a3e7a194b6c213e0ed8d556aa
2697+
primer-io-react-native: b03d9788fbf3d3beda6d58327c64920dd10e90b1
26982698
Primer3DS: 8fa0143a9f806eb016f3e780e72569fa149cc267
26992699
PrimerIPay88MYSDK: 436ee0be7e2c97e4e81456ccddee20175e9e3c4d
27002700
PrimerKlarnaSDK: 564105170cc7b467bf95c31851813ea41c468f8b

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

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88

99
/* Begin PBXBuildFile section */
1010
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
11-
2DEE2A8D1F0AE3FABABF2097 /* libPods-example_0_70_6-example_0_70_6Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 41609D7CD62E83B17D61A931 /* libPods-example_0_70_6-example_0_70_6Tests.a */; };
12-
453FB2C471CF823DF919F347 /* libPods-example_0_70_6.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CBF247F019221D2559C8C83 /* libPods-example_0_70_6.a */; };
13-
66BACA8C5D6CDE2952799981 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
14-
6CA351F7D8EEBFA61B7FE8CC /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
11+
1CBCEAEFEC492FCC3ED5BC57 /* libPods-example_0_70_6.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D08ADE6B0EA24F22BD4199AB /* libPods-example_0_70_6.a */; };
12+
4984D53D911BF1F8E2A15BBB /* libPods-example_0_70_6-example_0_70_6Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AEA699D1ABF8EA3FBE72E2D /* libPods-example_0_70_6-example_0_70_6Tests.a */; };
1513
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
1614
A127AC7D2BFF7A3500D45E2B /* RNTRedirectManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A127AC7C2BFF7A3500D45E2B /* RNTRedirectManagerTests.swift */; };
1715
A17A44A32BF7A57F00433548 /* UIImageExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A17A44A02BF7A57F00433548 /* UIImageExtensionTests.swift */; };
@@ -32,7 +30,6 @@
3230
A95FD9172E6ABFEA008218BC /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A95FD9162E6ABFDD008218BC /* AppDelegate.swift */; };
3331
A995178B2E7B5031008DF05E /* main.jsbundle in Resources */ = {isa = PBXBuildFile; fileRef = A99517892E7B138B008DF05E /* main.jsbundle */; };
3432
B593DA01D0EAA9788205A379 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 015E8424BC3952D31170ED2A /* PrivacyInfo.xcprivacy */; };
35-
C010C35792AF87095495BFED /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
3633
F004EDB82BF60A4E006F3CAA /* UIColorExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F004EDB72BF60A4E006F3CAA /* UIColorExtensionTests.swift */; };
3734
/* End PBXBuildFile section */
3835

@@ -50,13 +47,12 @@
5047
00E356EE1AD99517003FC87E /* example_0_70_6Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = example_0_70_6Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
5148
00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5249
015E8424BC3952D31170ED2A /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = example_0_70_6/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
53-
0CBF247F019221D2559C8C83 /* libPods-example_0_70_6.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example_0_70_6.a"; sourceTree = BUILT_PRODUCTS_DIR; };
5450
13B07F961A680F5B00A75B9A /* example_0_70_6.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = example_0_70_6.app; sourceTree = BUILT_PRODUCTS_DIR; };
5551
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = example_0_70_6/Images.xcassets; sourceTree = "<group>"; };
5652
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = example_0_70_6/Info.plist; sourceTree = "<group>"; };
53+
1AEA699D1ABF8EA3FBE72E2D /* libPods-example_0_70_6-example_0_70_6Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example_0_70_6-example_0_70_6Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
5754
235BA06D58811F5F136875A3 /* Pods-example_0_70_6-example_0_70_6Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example_0_70_6-example_0_70_6Tests.release.xcconfig"; path = "Target Support Files/Pods-example_0_70_6-example_0_70_6Tests/Pods-example_0_70_6-example_0_70_6Tests.release.xcconfig"; sourceTree = "<group>"; };
5855
3FBDD9509D7C3A202D3B555F /* Pods-example_0_70_6.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example_0_70_6.release.xcconfig"; path = "Target Support Files/Pods-example_0_70_6/Pods-example_0_70_6.release.xcconfig"; sourceTree = "<group>"; };
59-
41609D7CD62E83B17D61A931 /* libPods-example_0_70_6-example_0_70_6Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example_0_70_6-example_0_70_6Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
6056
50738B4CB372E6E265277700 /* Pods-example_0_70_6.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example_0_70_6.debug.xcconfig"; path = "Target Support Files/Pods-example_0_70_6/Pods-example_0_70_6.debug.xcconfig"; sourceTree = "<group>"; };
6157
54D5106AD4013908FBF58759 /* Pods-example_0_70_6-example_0_70_6Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example_0_70_6-example_0_70_6Tests.debug.xcconfig"; path = "Target Support Files/Pods-example_0_70_6-example_0_70_6Tests/Pods-example_0_70_6-example_0_70_6Tests.debug.xcconfig"; sourceTree = "<group>"; };
6258
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = example_0_70_6/LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -79,6 +75,7 @@
7975
A17A44C72BFF731B00433548 /* RNTPrimerHeadlessUniversalCheckoutTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RNTPrimerHeadlessUniversalCheckoutTests.swift; sourceTree = "<group>"; };
8076
A95FD9162E6ABFDD008218BC /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
8177
A99517892E7B138B008DF05E /* main.jsbundle */ = {isa = PBXFileReference; lastKnownFileType = text; path = main.jsbundle; sourceTree = "<group>"; };
78+
D08ADE6B0EA24F22BD4199AB /* libPods-example_0_70_6.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example_0_70_6.a"; sourceTree = BUILT_PRODUCTS_DIR; };
8279
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
8380
F004EDB42BF6091A006F3CAA /* example_0_70_6Tests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "example_0_70_6Tests-Bridging-Header.h"; sourceTree = "<group>"; };
8481
F004EDB72BF60A4E006F3CAA /* UIColorExtensionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIColorExtensionTests.swift; sourceTree = "<group>"; };
@@ -89,18 +86,15 @@
8986
isa = PBXFrameworksBuildPhase;
9087
buildActionMask = 2147483647;
9188
files = (
92-
6CA351F7D8EEBFA61B7FE8CC /* BuildFile in Frameworks */,
93-
2DEE2A8D1F0AE3FABABF2097 /* libPods-example_0_70_6-example_0_70_6Tests.a in Frameworks */,
89+
4984D53D911BF1F8E2A15BBB /* libPods-example_0_70_6-example_0_70_6Tests.a in Frameworks */,
9490
);
9591
runOnlyForDeploymentPostprocessing = 0;
9692
};
9793
13B07F8C1A680F5B00A75B9A /* Frameworks */ = {
9894
isa = PBXFrameworksBuildPhase;
9995
buildActionMask = 2147483647;
10096
files = (
101-
C010C35792AF87095495BFED /* BuildFile in Frameworks */,
102-
66BACA8C5D6CDE2952799981 /* BuildFile in Frameworks */,
103-
453FB2C471CF823DF919F347 /* libPods-example_0_70_6.a in Frameworks */,
97+
1CBCEAEFEC492FCC3ED5BC57 /* libPods-example_0_70_6.a in Frameworks */,
10498
);
10599
runOnlyForDeploymentPostprocessing = 0;
106100
};
@@ -146,8 +140,8 @@
146140
isa = PBXGroup;
147141
children = (
148142
ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
149-
0CBF247F019221D2559C8C83 /* libPods-example_0_70_6.a */,
150-
41609D7CD62E83B17D61A931 /* libPods-example_0_70_6-example_0_70_6Tests.a */,
143+
D08ADE6B0EA24F22BD4199AB /* libPods-example_0_70_6.a */,
144+
1AEA699D1ABF8EA3FBE72E2D /* libPods-example_0_70_6-example_0_70_6Tests.a */,
151145
);
152146
name = Frameworks;
153147
sourceTree = "<group>";
@@ -746,6 +740,11 @@
746740
"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers/platform/ios",
747741
"${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers",
748742
"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios",
743+
"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
744+
"${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers",
745+
"${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers/platform/ios",
746+
"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
747+
"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
749748
);
750749
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
751750
LD_RUNPATH_SEARCH_PATHS = (
@@ -826,6 +825,11 @@
826825
"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers/platform/ios",
827826
"${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers",
828827
"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios",
828+
"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
829+
"${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers",
830+
"${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers/platform/ios",
831+
"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
832+
"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
829833
);
830834
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
831835
LD_RUNPATH_SEARCH_PATHS = (

‎ios/PrimerSwiftInterop.h‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@protocol PrimerDelegate;
2+
3+
#import <React/RCTBridgeModule.h>
4+
#import <React/RCTViewManager.h>
5+
6+
// When using frameworks the import is different.
7+
#if __has_include("primer_io_react_native/primer_io_react_native-Swift.h")
8+
#import <primer_io_react_native/primer_io_react_native-Swift.h>
9+
#elif __has_include(<primer_io_react_native-Swift.h>)
10+
#import <primer_io_react_native-Swift.h>
11+
#endif

‎ios/Sources/NativePrimer/RCTNativePrimer.mm‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
//
55

66
#import "RCTNativePrimer.h"
7-
@protocol PrimerDelegate;
8-
#import "primer_io_react_native-Swift.h"
7+
#import "PrimerSwiftInterop.h"
98

109
#ifdef RCT_NEW_ARCH_ENABLED
1110
#import <NativePrimerSpec/NativePrimerSpec.h>

‎primer-io-react-native.podspec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Pod::Spec.new do |s|
1414
s.source = { :git => "https://github.com/primer-io/primer-sdk-react-native.git", :tag => "#{s.version}" }
1515

1616
s.source_files = "ios/**/*.{h,m,mm,swift}"
17+
s.private_header_files = ['ios/PrimerSwiftInterop.h' ]
1718

1819
s.dependency "React-Core"
1920
s.dependency "PrimerSDK", "2.42.0"

0 commit comments

Comments
 (0)