From 1422b2966a4327e592285c0f0aba7b83397e0090 Mon Sep 17 00:00:00 2001 From: Boris Nikolic Date: Wed, 20 Nov 2024 12:35:19 +0100 Subject: [PATCH] Test with specific PrimerSDK branch --- packages/example/ios/Podfile | 2 +- packages/example/ios/Podfile.lock | 33 +++--- .../example_0_70_6.xcodeproj/project.pbxproj | 100 +++++++++--------- .../xcshareddata/IDEWorkspaceChecks.plist | 8 -- .../PrimerSettings+Extensions.swift | 4 +- packages/sdk/ios/Sources/version.swift | 2 +- packages/sdk/primer-io-react-native.podspec | 2 +- 7 files changed, 75 insertions(+), 76 deletions(-) delete mode 100644 packages/example/ios/example_0_70_6.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/packages/example/ios/Podfile b/packages/example/ios/Podfile index 958a0e5db..4b6e72771 100644 --- a/packages/example/ios/Podfile +++ b/packages/example/ios/Podfile @@ -45,7 +45,7 @@ target 'example_0_70_6' do ) pod 'primer-io-react-native', :path => '../../sdk' - pod 'PrimerSDK', '2.32.0-express-checkout.1' + pod 'PrimerSDK', :git => 'https://github.com/primer-io/primer-sdk-ios.git', :branch => 'bn/feature/ACC-4508-Expose-ApplePay-Shipping-Options' pod 'Primer3DS' pod 'PrimerIPay88MYSDK' pod 'PrimerKlarnaSDK', '1.1.1' diff --git a/packages/example/ios/Podfile.lock b/packages/example/ios/Podfile.lock index 963b67c3a..127d611a9 100644 --- a/packages/example/ios/Podfile.lock +++ b/packages/example/ios/Podfile.lock @@ -11,15 +11,15 @@ PODS: - ReactCommon/turbomodule/core (= 0.72.0) - fmt (6.2.1) - glog (0.3.5) - - primer-io-react-native (2.27.0): - - PrimerSDK (= 2.31.0) + - primer-io-react-native (2.28.0-beta.1): + - PrimerSDK - React-Core - - Primer3DS (2.3.2) + - Primer3DS (2.4.0) - PrimerIPay88MYSDK (0.1.7) - PrimerKlarnaSDK (1.1.1) - - PrimerSDK (2.31.0): - - PrimerSDK/Core (= 2.31.0) - - PrimerSDK/Core (2.31.0) + - PrimerSDK (2.31.3): + - PrimerSDK/Core (= 2.31.3) + - PrimerSDK/Core (2.31.3) - PrimerStripeSDK (1.0.0) - RCT-Folly (2021.07.22.00): - boost @@ -416,7 +416,7 @@ DEPENDENCIES: - Primer3DS - PrimerIPay88MYSDK - PrimerKlarnaSDK (= 1.1.1) - - PrimerSDK + - PrimerSDK (from `https://github.com/primer-io/primer-sdk-ios.git`, branch `bn/feature/ACC-4508-Expose-ApplePay-Shipping-Options`) - PrimerStripeSDK (= 1.0.0) - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) @@ -462,7 +462,6 @@ SPEC REPOS: - Primer3DS - PrimerIPay88MYSDK - PrimerKlarnaSDK - - PrimerSDK - PrimerStripeSDK - SocketRocket @@ -479,6 +478,9 @@ EXTERNAL SOURCES: :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" primer-io-react-native: :path: "../../sdk" + PrimerSDK: + :branch: bn/feature/ACC-4508-Expose-ApplePay-Shipping-Options + :git: https://github.com/primer-io/primer-sdk-ios.git RCT-Folly: :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec" RCTRequired: @@ -552,6 +554,11 @@ EXTERNAL SOURCES: Yoga: :path: "../node_modules/react-native/ReactCommon/yoga" +CHECKOUT OPTIONS: + PrimerSDK: + :commit: 677b98e205ca62a28f67940e2f4fe39bcef6c855 + :git: https://github.com/primer-io/primer-sdk-ios.git + SPEC CHECKSUMS: boost: 57d2868c099736d80fcd648bf211b4431e51a558 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 @@ -559,11 +566,11 @@ SPEC CHECKSUMS: FBReactNativeSpec: 6e7e74b1ed7f0a1a469a82a67521b33285f5fef3 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b - primer-io-react-native: 4b4eb3b62c7787537191a6f74598db8a78c29587 - Primer3DS: 81e7969033230c7346a517cd609be956914738bb + primer-io-react-native: a1692a02390c4b80b185f39c291cc0b54da8509b + Primer3DS: 0cd588a22e3c3c89fbbced8b252f5fab187a9ba1 PrimerIPay88MYSDK: 436ee0be7e2c97e4e81456ccddee20175e9e3c4d PrimerKlarnaSDK: 564105170cc7b467bf95c31851813ea41c468f8b - PrimerSDK: 78d1a48ba9b4677f78da9750448af6c72007f4fe + PrimerSDK: 97197b708f58d992aaa40163bc3f3ba58fa8a2e6 PrimerStripeSDK: c37d4e7c1b5256d67d4890c4cc4b38ddc9427489 RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 RCTRequired: 656ef0536dd60a9740961ade6a64ba0cb0572d2b @@ -603,6 +610,6 @@ SPEC CHECKSUMS: SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 Yoga: 1d6727ed193122f6adaf435c3de1a768326ff83b -PODFILE CHECKSUM: 4505e915c8982e98dcb8297a1c627233ce3a067f +PODFILE CHECKSUM: e51ec02f6773a88bef8a0c92c8d7392c389ab0c3 -COCOAPODS: 1.15.2 +COCOAPODS: 1.16.2 diff --git a/packages/example/ios/example_0_70_6.xcodeproj/project.pbxproj b/packages/example/ios/example_0_70_6.xcodeproj/project.pbxproj index 6c5c0bcb1..ab07f6b67 100644 --- a/packages/example/ios/example_0_70_6.xcodeproj/project.pbxproj +++ b/packages/example/ios/example_0_70_6.xcodeproj/project.pbxproj @@ -11,7 +11,6 @@ 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; - 5B6FD62EA8AF38BB98287424 /* libPods-example_0_70_6.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5461A80700BFFD7D2638CFBC /* libPods-example_0_70_6.a */; }; 6CA351F7D8EEBFA61B7FE8CC /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; A127AC7D2BFF7A3500D45E2B /* RNTRedirectManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A127AC7C2BFF7A3500D45E2B /* RNTRedirectManagerTests.swift */; }; @@ -31,8 +30,9 @@ A17A44C02BFF650A00433548 /* RNTBanksCollectableDataTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A17A44BF2BFF650A00433548 /* RNTBanksCollectableDataTests.swift */; }; A17A44C82BFF731B00433548 /* RNTPrimerHeadlessUniversalCheckoutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A17A44C72BFF731B00433548 /* RNTPrimerHeadlessUniversalCheckoutTests.swift */; }; C010C35792AF87095495BFED /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; - E284668B61D39631DD0DF8E4 /* libPods-example_0_70_6-example_0_70_6Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9E634CC5265A75354348809 /* libPods-example_0_70_6-example_0_70_6Tests.a */; }; + E16CF7F4755D26808C11D46B /* libPods-example_0_70_6.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F7C9D32523BA7FCFF6870795 /* libPods-example_0_70_6.a */; }; F004EDB82BF60A4E006F3CAA /* UIColorExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F004EDB72BF60A4E006F3CAA /* UIColorExtensionTests.swift */; }; + F0807ABD1594259BA09C4CDA /* libPods-example_0_70_6-example_0_70_6Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 584BBA183A847B5C104F7B64 /* libPods-example_0_70_6-example_0_70_6Tests.a */; }; F0C3A3482BF60837002E6AC4 /* main.jsbundle in Resources */ = {isa = PBXBuildFile; fileRef = 04979F672AB1E55A00469C99 /* main.jsbundle */; }; /* End PBXBuildFile section */ @@ -49,6 +49,7 @@ /* Begin PBXFileReference section */ 00E356EE1AD99517003FC87E /* example_0_70_6Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = example_0_70_6Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 03FEECD94163DE982D32B0B3 /* 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 = ""; }; 04979F672AB1E55A00469C99 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = ""; }; 13B07F961A680F5B00A75B9A /* example_0_70_6.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = example_0_70_6.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = example_0_70_6/AppDelegate.h; sourceTree = ""; }; @@ -56,12 +57,9 @@ 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = example_0_70_6/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = example_0_70_6/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = example_0_70_6/main.m; sourceTree = ""; }; - 2618D20E7DC27E7C47AF2531 /* 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 = ""; }; - 3542D0B2E131D922AF48E77E /* 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 = ""; }; - 35808B8DBC5F9AEB80654DB3 /* 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 = ""; }; - 5461A80700BFFD7D2638CFBC /* libPods-example_0_70_6.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example_0_70_6.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 32D72B24D505223467B9C369 /* 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 = ""; }; + 584BBA183A847B5C104F7B64 /* 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; }; 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = example_0_70_6/LaunchScreen.storyboard; sourceTree = ""; }; - 82DCDFD2FB9AB5118FE4FF8C /* 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 = ""; }; 848652F22954A52C0071549C /* example_0_70_6.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = example_0_70_6.entitlements; path = example_0_70_6/example_0_70_6.entitlements; sourceTree = ""; }; A127AC7C2BFF7A3500D45E2B /* RNTRedirectManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RNTRedirectManagerTests.swift; sourceTree = ""; }; A17A44A02BF7A57F00433548 /* UIImageExtensionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIImageExtensionTests.swift; sourceTree = ""; }; @@ -79,10 +77,12 @@ A17A44BB2BFB8C7B00433548 /* RNTNativeErrorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RNTNativeErrorTests.swift; sourceTree = ""; }; A17A44BF2BFF650A00433548 /* RNTBanksCollectableDataTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RNTBanksCollectableDataTests.swift; sourceTree = ""; }; A17A44C72BFF731B00433548 /* RNTPrimerHeadlessUniversalCheckoutTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RNTPrimerHeadlessUniversalCheckoutTests.swift; sourceTree = ""; }; - A9E634CC5265A75354348809 /* 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; }; + A66F8B69F9339E3764A33ECD /* 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 = ""; }; + C761421CC33EB9114A7D7D79 /* 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 = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; F004EDB42BF6091A006F3CAA /* example_0_70_6Tests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "example_0_70_6Tests-Bridging-Header.h"; sourceTree = ""; }; F004EDB72BF60A4E006F3CAA /* UIColorExtensionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIColorExtensionTests.swift; sourceTree = ""; }; + F7C9D32523BA7FCFF6870795 /* libPods-example_0_70_6.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example_0_70_6.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -91,7 +91,7 @@ buildActionMask = 2147483647; files = ( 6CA351F7D8EEBFA61B7FE8CC /* BuildFile in Frameworks */, - E284668B61D39631DD0DF8E4 /* libPods-example_0_70_6-example_0_70_6Tests.a in Frameworks */, + F0807ABD1594259BA09C4CDA /* libPods-example_0_70_6-example_0_70_6Tests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -100,7 +100,7 @@ buildActionMask = 2147483647; files = ( C010C35792AF87095495BFED /* BuildFile in Frameworks */, - 5B6FD62EA8AF38BB98287424 /* libPods-example_0_70_6.a in Frameworks */, + E16CF7F4755D26808C11D46B /* libPods-example_0_70_6.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -148,8 +148,8 @@ isa = PBXGroup; children = ( ED297162215061F000B7C4FE /* JavaScriptCore.framework */, - 5461A80700BFFD7D2638CFBC /* libPods-example_0_70_6.a */, - A9E634CC5265A75354348809 /* libPods-example_0_70_6-example_0_70_6Tests.a */, + F7C9D32523BA7FCFF6870795 /* libPods-example_0_70_6.a */, + 584BBA183A847B5C104F7B64 /* libPods-example_0_70_6-example_0_70_6Tests.a */, ); name = Frameworks; sourceTree = ""; @@ -224,10 +224,10 @@ BBD78D7AC51CEA395F1C20DB /* Pods */ = { isa = PBXGroup; children = ( - 82DCDFD2FB9AB5118FE4FF8C /* Pods-example_0_70_6.debug.xcconfig */, - 35808B8DBC5F9AEB80654DB3 /* Pods-example_0_70_6.release.xcconfig */, - 2618D20E7DC27E7C47AF2531 /* Pods-example_0_70_6-example_0_70_6Tests.debug.xcconfig */, - 3542D0B2E131D922AF48E77E /* Pods-example_0_70_6-example_0_70_6Tests.release.xcconfig */, + 03FEECD94163DE982D32B0B3 /* Pods-example_0_70_6.debug.xcconfig */, + 32D72B24D505223467B9C369 /* Pods-example_0_70_6.release.xcconfig */, + C761421CC33EB9114A7D7D79 /* Pods-example_0_70_6-example_0_70_6Tests.debug.xcconfig */, + A66F8B69F9339E3764A33ECD /* Pods-example_0_70_6-example_0_70_6Tests.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -239,12 +239,12 @@ isa = PBXNativeTarget; buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "example_0_70_6Tests" */; buildPhases = ( - CEC87FC88254C6D182423612 /* [CP] Check Pods Manifest.lock */, + BFE3C690B9C9FDA0C1FB246C /* [CP] Check Pods Manifest.lock */, 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, 00E356EC1AD99517003FC87E /* Resources */, - 1AA03BF8C4C1D0A176327C04 /* [CP] Embed Pods Frameworks */, - 57ADE4DACA1774C1D1253F8F /* [CP] Copy Pods Resources */, + E91CA344DCF5C5EDF388A7DE /* [CP] Embed Pods Frameworks */, + 81C4CC695331F63CE0AE90D0 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -260,15 +260,15 @@ isa = PBXNativeTarget; buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "example_0_70_6" */; buildPhases = ( - CEA153A1D113F533AAD28CC8 /* [CP] Check Pods Manifest.lock */, + C98B506EFBA826D63D02F134 /* [CP] Check Pods Manifest.lock */, 04DB853E2B766F4700910EAE /* Update Version */, FD10A7F022414F080027D42C /* Start Packager */, 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, - 59614C0A2C55009832B99853 /* [CP] Embed Pods Frameworks */, - CEF58893CD15DE8B081D7F12 /* [CP] Copy Pods Resources */, + 68AD7E7481E7AAF287315EFC /* [CP] Embed Pods Frameworks */, + 30720E07EEA4FFFF93F1F3B3 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -375,58 +375,58 @@ shellPath = /bin/sh; shellScript = "set -e\n\nWITH_ENVIRONMENT=\"../node_modules/react-native/scripts/xcode/with-environment.sh\"\nSCRIPT_LOCATION=\"../../../scripts/update-ios-version.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $SCRIPT_LOCATION\"\n"; }; - 1AA03BF8C4C1D0A176327C04 /* [CP] Embed Pods Frameworks */ = { + 30720E07EEA4FFFF93F1F3B3 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-example_0_70_6-example_0_70_6Tests/Pods-example_0_70_6-example_0_70_6Tests-frameworks-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-example_0_70_6/Pods-example_0_70_6-resources-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-example_0_70_6-example_0_70_6Tests/Pods-example_0_70_6-example_0_70_6Tests-frameworks-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-example_0_70_6/Pods-example_0_70_6-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-example_0_70_6-example_0_70_6Tests/Pods-example_0_70_6-example_0_70_6Tests-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-example_0_70_6/Pods-example_0_70_6-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 57ADE4DACA1774C1D1253F8F /* [CP] Copy Pods Resources */ = { + 68AD7E7481E7AAF287315EFC /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-example_0_70_6-example_0_70_6Tests/Pods-example_0_70_6-example_0_70_6Tests-resources-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-example_0_70_6/Pods-example_0_70_6-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Copy Pods Resources"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-example_0_70_6-example_0_70_6Tests/Pods-example_0_70_6-example_0_70_6Tests-resources-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-example_0_70_6/Pods-example_0_70_6-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-example_0_70_6-example_0_70_6Tests/Pods-example_0_70_6-example_0_70_6Tests-resources.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-example_0_70_6/Pods-example_0_70_6-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 59614C0A2C55009832B99853 /* [CP] Embed Pods Frameworks */ = { + 81C4CC695331F63CE0AE90D0 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-example_0_70_6/Pods-example_0_70_6-frameworks-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-example_0_70_6-example_0_70_6Tests/Pods-example_0_70_6-example_0_70_6Tests-resources-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-example_0_70_6/Pods-example_0_70_6-frameworks-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-example_0_70_6-example_0_70_6Tests/Pods-example_0_70_6-example_0_70_6Tests-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-example_0_70_6/Pods-example_0_70_6-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-example_0_70_6-example_0_70_6Tests/Pods-example_0_70_6-example_0_70_6Tests-resources.sh\"\n"; showEnvVarsInLog = 0; }; - CEA153A1D113F533AAD28CC8 /* [CP] Check Pods Manifest.lock */ = { + BFE3C690B9C9FDA0C1FB246C /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -441,14 +441,14 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-example_0_70_6-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-example_0_70_6-example_0_70_6Tests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - CEC87FC88254C6D182423612 /* [CP] Check Pods Manifest.lock */ = { + C98B506EFBA826D63D02F134 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -463,28 +463,28 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-example_0_70_6-example_0_70_6Tests-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-example_0_70_6-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - CEF58893CD15DE8B081D7F12 /* [CP] Copy Pods Resources */ = { + E91CA344DCF5C5EDF388A7DE /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-example_0_70_6/Pods-example_0_70_6-resources-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-example_0_70_6-example_0_70_6Tests/Pods-example_0_70_6-example_0_70_6Tests-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Copy Pods Resources"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-example_0_70_6/Pods-example_0_70_6-resources-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-example_0_70_6-example_0_70_6Tests/Pods-example_0_70_6-example_0_70_6Tests-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-example_0_70_6/Pods-example_0_70_6-resources.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-example_0_70_6-example_0_70_6Tests/Pods-example_0_70_6-example_0_70_6Tests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; FD10A7F022414F080027D42C /* Start Packager */ = { @@ -555,7 +555,7 @@ /* Begin XCBuildConfiguration section */ 00E356F61AD99517003FC87E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2618D20E7DC27E7C47AF2531 /* Pods-example_0_70_6-example_0_70_6Tests.debug.xcconfig */; + baseConfigurationReference = C761421CC33EB9114A7D7D79 /* Pods-example_0_70_6-example_0_70_6Tests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ENABLE_MODULES = YES; @@ -594,7 +594,7 @@ }; 00E356F71AD99517003FC87E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3542D0B2E131D922AF48E77E /* Pods-example_0_70_6-example_0_70_6Tests.release.xcconfig */; + baseConfigurationReference = A66F8B69F9339E3764A33ECD /* Pods-example_0_70_6-example_0_70_6Tests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ENABLE_MODULES = YES; @@ -629,7 +629,7 @@ }; 13B07F941A680F5B00A75B9A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 82DCDFD2FB9AB5118FE4FF8C /* Pods-example_0_70_6.debug.xcconfig */; + baseConfigurationReference = 03FEECD94163DE982D32B0B3 /* Pods-example_0_70_6.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; @@ -663,7 +663,7 @@ }; 13B07F951A680F5B00A75B9A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 35808B8DBC5F9AEB80654DB3 /* Pods-example_0_70_6.release.xcconfig */; + baseConfigurationReference = 32D72B24D505223467B9C369 /* Pods-example_0_70_6.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; diff --git a/packages/example/ios/example_0_70_6.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/example/ios/example_0_70_6.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003..000000000 --- a/packages/example/ios/example_0_70_6.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/packages/sdk/ios/Sources/DataModels/PrimerSettings+Extensions.swift b/packages/sdk/ios/Sources/DataModels/PrimerSettings+Extensions.swift index ac8a2f4d3..3767d5832 100644 --- a/packages/sdk/ios/Sources/DataModels/PrimerSettings+Extensions.swift +++ b/packages/sdk/ios/Sources/DataModels/PrimerSettings+Extensions.swift @@ -45,7 +45,7 @@ extension PrimerSettings { if let rnShippingOptions = rnApplePayOptions["shippingOptions"] as? [String: Any] { let requireShippingMethod = rnShippingOptions["requireShippingMethod"] as? Bool ?? false - var shippingContactFields: [PrimerApplePayOptions.ShippingOptions.ShippingContactField]? = nil + var shippingContactFields: [PrimerApplePayOptions.RequiredContactField]? = nil if let requiredFieldsStrings = rnShippingOptions["shippingContactFields"] as? [String] { shippingContactFields = requiredFieldsStrings.compactMap { fieldStr in switch fieldStr { @@ -71,7 +71,7 @@ extension PrimerSettings { var billingOptions: PrimerApplePayOptions.BillingOptions? = nil if let rnBillingOptions = rnApplePayOptions["billingOptions"] as? [String: Any] { - var requiredBillingContactFields: [PrimerApplePayOptions.BillingOptions.RequiredBillingContactFields]? = nil + var requiredBillingContactFields: [PrimerApplePayOptions.RequiredContactField]? = nil if let requiredFieldsStrings = rnBillingOptions["requiredBillingContactFields"] as? [String] { requiredBillingContactFields = requiredFieldsStrings.compactMap { fieldStr in switch fieldStr { diff --git a/packages/sdk/ios/Sources/version.swift b/packages/sdk/ios/Sources/version.swift index 386184dd4..eb7213eac 100644 --- a/packages/sdk/ios/Sources/version.swift +++ b/packages/sdk/ios/Sources/version.swift @@ -1,2 +1,2 @@ // swiftlint:disable:next identifier_name -public let PrimerReactNativeSDKVersion = "2.27.0" +public let PrimerReactNativeSDKVersion = "2.28.0-beta.1" diff --git a/packages/sdk/primer-io-react-native.podspec b/packages/sdk/primer-io-react-native.podspec index 3b1a80f49..7a845b064 100644 --- a/packages/sdk/primer-io-react-native.podspec +++ b/packages/sdk/primer-io-react-native.podspec @@ -16,5 +16,5 @@ Pod::Spec.new do |s| s.source_files = "ios/**/*.{h,m,mm,swift}" s.dependency "React-Core" - s.dependency "PrimerSDK", "2.32.0-express-checkout.1" + s.dependency "PrimerSDK" end