Skip to content

Commit 32a34cd

Browse files
Fix(Sample): Archiving failing due to duplicate build outputs (#368)
* fix(sample): archiving unsuccessful * feat: cleanup unnecessary workarounds for archiving ios
1 parent 2f00545 commit 32a34cd

File tree

3 files changed

+8
-17
lines changed

3 files changed

+8
-17
lines changed

sample/ios/Podfile

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ target 'ReactNative' do
2828
:new_arch_enabled => true
2929
)
3030

31+
# Pod dependency should be inside the target block
32+
pod "RNShopifyCheckoutSheetKit", :path => "../../modules/@shopify/checkout-sheet-kit"
33+
3134
target 'ReactNativeTests' do
3235
inherit! :complete
3336
end
@@ -41,19 +44,5 @@ target 'ReactNative' do
4144
:mac_catalyst_enabled => false,
4245
:ccache_enabled => true
4346
)
44-
45-
# WORKAROUND
46-
# This fixes issues with the 'React-Core-AccessibilityResources' dependency when archiving the sample app in XCode:
47-
installer.pods_project.targets.each do |target|
48-
if target.name == "React-Core-AccessibilityResources"
49-
target.remove_from_project
50-
end
51-
52-
if target.name == "React-Core-RCTI18nStrings"
53-
target.remove_from_project
54-
end
55-
end
5647
end
5748
end
58-
59-
pod "RNShopifyCheckoutSheetKit", :path => "../../modules/@shopify/checkout-sheet-kit"

sample/ios/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2888,6 +2888,6 @@ SPEC CHECKSUMS:
28882888
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
28892889
Yoga: a742cc68e8366fcfc681808162492bc0aa7a9498
28902890

2891-
PODFILE CHECKSUM: 42a4ad42b0177ca0f927363d8f2b6059c6dd77c7
2891+
PODFILE CHECKSUM: f2daae5c793dd9545ae6e55c038d9108806ba98c
28922892

28932893
COCOAPODS: 1.15.2

sample/ios/ReactNative/ReactNative.entitlements

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
<key>com.apple.developer.associated-domains</key>
66
<array>
77
<string>webcredentials:myshopify.com</string>
8-
<string>applinks:myshopify.com</string>
8+
<string>applinks:myshopify.com</string>
99
</array>
1010
<key>com.apple.developer.in-app-payments</key>
11-
<true/>
11+
<array>
12+
<string>merchant.com.shopify.example.CheckoutKitReactNative.ApplePay</string>
13+
</array>
1214
</dict>
1315
</plist>

0 commit comments

Comments
 (0)