From 406343d263ca35c83b50ececc01e2210e741ce9b Mon Sep 17 00:00:00 2001 From: Brandon Jenniges Date: Fri, 24 Mar 2023 15:21:47 -0500 Subject: [PATCH 1/6] Update framework for 1.6.1 --- .../Info.plist | Bin 862 -> 862 bytes .../ThreeDSSDKResources.bundle/setup | 32 ++++++++++++++++-- .../Info.plist | Bin 889 -> 889 bytes .../ThreeDSSDKResources.bundle/setup | 32 ++++++++++++++++-- .../Info.plist | Bin 916 -> 916 bytes .../ca-ES.lproj/Localizable.strings | Bin 3003 -> 3006 bytes .../en-AU.lproj/Localizable.strings | Bin 2112 -> 2117 bytes .../en-CA.lproj/Localizable.strings | Bin 2112 -> 2123 bytes .../en-GB.lproj/Localizable.strings | Bin 2152 -> 2157 bytes .../en-IE.lproj/Localizable.strings | Bin 2104 -> 2107 bytes .../ja.lproj/Localizable.strings | Bin 2189 -> 2191 bytes .../en-AU.lproj/Localizable.strings | Bin 1042 -> 1047 bytes .../en-CA.lproj/Localizable.strings | Bin 1042 -> 1053 bytes .../en-GB.lproj/Localizable.strings | Bin 1082 -> 1087 bytes .../en-IE.lproj/Localizable.strings | Bin 1034 -> 1037 bytes .../ja.lproj/Localizable.strings | Bin 1127 -> 1129 bytes .../SquareInAppPaymentsSDK.framework/setup | 32 ++++++++++++++++-- .../Info.plist | Bin 943 -> 943 bytes .../ca-ES.lproj/Localizable.strings | Bin 3003 -> 3006 bytes .../en-AU.lproj/Localizable.strings | Bin 2112 -> 2117 bytes .../en-CA.lproj/Localizable.strings | Bin 2112 -> 2123 bytes .../en-GB.lproj/Localizable.strings | Bin 2152 -> 2157 bytes .../en-IE.lproj/Localizable.strings | Bin 2104 -> 2107 bytes .../ja.lproj/Localizable.strings | Bin 2189 -> 2191 bytes .../en-AU.lproj/Localizable.strings | Bin 1042 -> 1047 bytes .../en-CA.lproj/Localizable.strings | Bin 1042 -> 1053 bytes .../en-GB.lproj/Localizable.strings | Bin 1082 -> 1087 bytes .../en-IE.lproj/Localizable.strings | Bin 1034 -> 1037 bytes .../ja.lproj/Localizable.strings | Bin 1127 -> 1129 bytes .../SquareInAppPaymentsSDK.framework/setup | 32 ++++++++++++++++-- 30 files changed, 120 insertions(+), 8 deletions(-) diff --git a/XCFrameworks/SquareBuyerVerificationSDK.xcframework/ios-arm64/SquareBuyerVerificationSDK.framework/Info.plist b/XCFrameworks/SquareBuyerVerificationSDK.xcframework/ios-arm64/SquareBuyerVerificationSDK.framework/Info.plist index 1c9f0eaa3b0b3f7cf4719dfac1425faa7fabf67d..bd168dada2632fd5dfbce6e162119842e00f69f2 100755 GIT binary patch delta 13 Ucmcb|c8_htZ6-#;$#b`=lqmRg@XLzlEj?NZ`t};XV)e9|19vvJ?XV diff --git a/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64/SquareInAppPaymentsSDK.framework/SQIPAssetFinderResources.bundle/en-AU.lproj/Localizable.strings b/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64/SquareInAppPaymentsSDK.framework/SQIPAssetFinderResources.bundle/en-AU.lproj/Localizable.strings index 488c92de8f61f8f1d1d2bba431e62ba6ee5cdcd0..b4f224321a1a94f8bab2a491686375af67515ee8 100755 GIT binary patch delta 69 zcmX>ga8zK!Ef$u7{Nj?y_gEHkMg#y^$@wX%o10ndnB+THds!#3&R{*q=FH~KmduvM Ywu|i{yB51IdnS7~`=ZGT9P*620d8~_i2wiq delta 64 zcmX>qa6n+gEf$t2&j5wV_gEIP1Or){J6P+OAQV@qV)%65lc TmED6qg}se^?qpRCdB$x3tKt(g diff --git a/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64/SquareInAppPaymentsSDK.framework/SQIPAssetFinderResources.bundle/en-CA.lproj/Localizable.strings b/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64/SquareInAppPaymentsSDK.framework/SQIPAssetFinderResources.bundle/en-CA.lproj/Localizable.strings index 488c92de8f61f8f1d1d2bba431e62ba6ee5cdcd0..fa605ed0c946d67064c793ec4631d7389b6720bb 100755 GIT binary patch delta 93 zcmX>ga9Uu)c@{xU*SwO{B88HSRE2{4;*!Li$#+>6@k9rJ*$T<|DXE*AS<9Hzf3ilf vma#Um_OVW8oxwVf^$MFOn=e}?TMpX+w&&~y?7{5$>=W5nOjh8KXFLc19pE0k delta 82 zcmX>ta6n+gc@{o3*SwO{B88HSRD~$dfXNS77O?~a8Jqi9%b3)^v4*l1v(~dVvv#od lvQB0_$!5pq#1_Yv$hMX34!bJ52YU*88~fbJ+8pwX+W>J)865xs diff --git a/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64/SquareInAppPaymentsSDK.framework/SQIPAssetFinderResources.bundle/en-GB.lproj/Localizable.strings b/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64/SquareInAppPaymentsSDK.framework/SQIPAssetFinderResources.bundle/en-GB.lproj/Localizable.strings index ac9a3ba4f2b9e2979dfa5576ff67c78adc6902dc..18061e6fffb2401aefb369be83edd7120229f8ed 100755 GIT binary patch delta 69 zcmaDM@K#{MEf$u7{Nj?y_gEHkMg#y^$@wX%o10meG0AtZ_Oec5oxysJ&6zEbEtjo; Z?Fidzb`$nQ_FDFp?58GsaL6-01^|f_ z2Nbgy1ug?87zJwuk_DXwp#`P|s|B_N(*`yMQwDAZaR$Z)=?5eSUk8K-zX$Y_Z3rI$ E1+0)DCjbBd delta 92 zcmeAd>=oSbm__N<%5;-2fRM5pVzi delta 58 zcmbQvF^OY?H4{s4lxM(Z7p7=N79c}m@?vIdNqZ(|rYxo&rWs5ZnBFkUG8;0RGY2!5 NG51dX&MeQk4FJiH50U@? diff --git a/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64/SquareInAppPaymentsSDK.framework/SQIPCardEntryViewResources.bundle/en-CA.lproj/Localizable.strings b/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64/SquareInAppPaymentsSDK.framework/SQIPCardEntryViewResources.bundle/en-CA.lproj/Localizable.strings index 96dc27b0dca1e48aac97067f0a5c7a1136e37502..2d9f1876797ec751a9888db3da73c6b99a53e76d 100755 GIT binary patch delta 105 zcmbQlF_&Y5H4{&CKz?yaVva&`eoE?Qd!_(JK~2}ZlGGxFl8jV^03~6gB+BGQp^VdC(suS delta 68 zcmbQsF^OY?H4{s4lxM(ZccuVFJ~h|8lGGxFl8jUZpxERU%r=ttOwLSMOg&69m@Y8A XVU}e!WHx6GW-epyo&1+so^cxhn#U6> diff --git a/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64/SquareInAppPaymentsSDK.framework/SQIPCardEntryViewResources.bundle/en-GB.lproj/Localizable.strings b/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64/SquareInAppPaymentsSDK.framework/SQIPCardEntryViewResources.bundle/en-GB.lproj/Localizable.strings index d796e7e58323e26659571e8b315bb411c3dce8d9..ac5c728bd41527d09b4e02b6132d031ab901c604 100755 GIT binary patch delta 63 zcmdnRv7cjuH4|q;S&BuT@i72|yAr?v delta 58 zcmdnbv5RAaH4{s4lxM(Z7p7)L79c}m@@ZykNqZ(=rV^$FOlz2)Ff%Y4GP^Q+Gp938 NVct4fo<*MV9suAi4}Jgu diff --git a/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64/SquareInAppPaymentsSDK.framework/SQIPCardEntryViewResources.bundle/en-IE.lproj/Localizable.strings b/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64/SquareInAppPaymentsSDK.framework/SQIPCardEntryViewResources.bundle/en-IE.lproj/Localizable.strings index 0b0e3bb233edcdd5aa49d33df3087fe537917e6b..fca2e84e8af89e03e4cbaba73bc634a3e5ebda2f 100755 GIT binary patch delta 72 zcmeC;=;hd8&BPJznpu>bpOU)Sp2>rePt`TAB(+GPBqLP;C_Z@_v$do%lRHxuQxDS& brVC7Om}Qv_na!E~nTwb^C%| delta 69 zcmeC>=;GL5&BPKMMgJ6R^gVhFq3{DzkmsL+TG6*&3F-S9TG3cJ~)qnrw2~1*>xmlta Fc>&;)5%vH8 delta 47 zcmaFK@tkAB4Q542gJ6R^gVhFq3{DtimsL+TG6*+_XNY3(WC$?W3=};%`8RVeBR2r6 CmJu=l diff --git a/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64/SquareInAppPaymentsSDK.framework/setup b/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64/SquareInAppPaymentsSDK.framework/setup index c27b1ab..3896607 100755 --- a/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64/SquareInAppPaymentsSDK.framework/setup +++ b/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64/SquareInAppPaymentsSDK.framework/setup @@ -8,10 +8,20 @@ IFS=$(echo "") IAP_SDK_FRAMEWORKS=("SquareInAppPaymentsSDK" "SquareBuyerVerificationSDK") MAIN_FRAMEWORKS_DIR="$BUILT_PRODUCTS_DIR/$FRAMEWORKS_FOLDER_PATH" +SECONDARY_FRAMEWORKS_DIR="$CONFIGURATION_BUILD_DIR" # Unpack frameworks for FRAMEWORK_NAME in "${IAP_SDK_FRAMEWORKS[@]}"; do - NESTED_FRAMEWORKS_DIR="$MAIN_FRAMEWORKS_DIR/$FRAMEWORK_NAME.framework/Frameworks" + FRAMEWORK_PATH="$FRAMEWORK_NAME.framework/Frameworks" + MAIN_NESTED_FRAMEWORKS_DIR="$MAIN_FRAMEWORKS_DIR/$FRAMEWORK_PATH" + SECONDARY_NESTED_FRAMEWORKS_DIR="$SECONDARY_FRAMEWORKS_DIR/$FRAMEWORK_PATH" + + if [ -d "$MAIN_NESTED_FRAMEWORKS_DIR" ]; then + NESTED_FRAMEWORKS_DIR=$MAIN_NESTED_FRAMEWORKS_DIR + else + NESTED_FRAMEWORKS_DIR=$SECONDARY_NESTED_FRAMEWORKS_DIR + fi + if [ -d "$NESTED_FRAMEWORKS_DIR" ]; then # Handle all nested frameworks that are fat frameworks find "$NESTED_FRAMEWORKS_DIR" -name '*.framework' ! -path '*.xcframework/*' -type d | while read -r FRAMEWORK; do @@ -57,6 +67,24 @@ for FRAMEWORK_NAME in "${IAP_SDK_FRAMEWORKS[@]}"; do fi done +# Workaround for Swift Package Manager +SOURCE_PACKAGE_FRAMEWORK_DIR="${BUILD_DIR%Build/*}SourcePackages/checkouts/in-app-payments-ios/XCFrameworks" + +if [ -d "$SOURCE_PACKAGE_FRAMEWORK_DIR" ]; then + for FRAMEWORK_NAME in "${IAP_SDK_FRAMEWORKS[@]}"; do + FRAMEWORK_PATH="$FRAMEWORK_NAME.xcframework" + SOURCE_FRAMEWORK_NESTED_DIR="$SOURCE_PACKAGE_FRAMEWORK_DIR/$FRAMEWORK_PATH" + # Find root directory inside of regular and simulator folders + find "$SOURCE_FRAMEWORK_NESTED_DIR" -name '*.framework' ! -path '*.framework/Frameworks/*' -type d | while read -r FRAMEWORK_DIR; do + rm -rf "$FRAMEWORK_DIR/Frameworks" + # Delete the setup script if archiving + if [ "$ACTION" = "install" ]; then + rm -rf "$FRAMEWORK_DIR/setup" + fi + done + done +fi + IFS=$OLDIFS # Don't choke if projects or targets have spaces in the name @@ -77,4 +105,4 @@ find "${CODESIGNING_FOLDER_PATH}/Frameworks" -name "*.framework" | while read -r fi done -IFS=$OLDIFS +IFS=$OLDIFS \ No newline at end of file diff --git a/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64_x86_64-simulator/SquareInAppPaymentsSDK.framework/Info.plist b/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64_x86_64-simulator/SquareInAppPaymentsSDK.framework/Info.plist index beb5153da80b36ca7997effc967291aca4517d3f..3440c0965ce35499d1b640935360ab397bfc2c2c 100755 GIT binary patch delta 58 zcmZ3_zMg$UE|Z3tp=qj#MWRJoYKp13fu&hmN|J?HYMOacs=0}2nnj|Kak6P*VoKWN OsZ5g@4JT_dw*deLViB_d delta 58 zcmZ3_zMg$UE|W%La-wOfsYzmziBW2zfnicgicy+*T9T=SiGh)ck!hMyig}VrqJib) OsZ5g@4JKb`=lqmRg@XLzlEj?NZ`t};XV)e9|19vvJ?XV diff --git a/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64_x86_64-simulator/SquareInAppPaymentsSDK.framework/SQIPAssetFinderResources.bundle/en-AU.lproj/Localizable.strings b/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64_x86_64-simulator/SquareInAppPaymentsSDK.framework/SQIPAssetFinderResources.bundle/en-AU.lproj/Localizable.strings index 488c92de8f61f8f1d1d2bba431e62ba6ee5cdcd0..b4f224321a1a94f8bab2a491686375af67515ee8 100755 GIT binary patch delta 69 zcmX>ga8zK!Ef$u7{Nj?y_gEHkMg#y^$@wX%o10ndnB+THds!#3&R{*q=FH~KmduvM Ywu|i{yB51IdnS7~`=ZGT9P*620d8~_i2wiq delta 64 zcmX>qa6n+gEf$t2&j5wV_gEIP1Or){J6P+OAQV@qV)%65lc TmED6qg}se^?qpRCdB$x3tKt(g diff --git a/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64_x86_64-simulator/SquareInAppPaymentsSDK.framework/SQIPAssetFinderResources.bundle/en-CA.lproj/Localizable.strings b/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64_x86_64-simulator/SquareInAppPaymentsSDK.framework/SQIPAssetFinderResources.bundle/en-CA.lproj/Localizable.strings index 488c92de8f61f8f1d1d2bba431e62ba6ee5cdcd0..fa605ed0c946d67064c793ec4631d7389b6720bb 100755 GIT binary patch delta 93 zcmX>ga9Uu)c@{xU*SwO{B88HSRE2{4;*!Li$#+>6@k9rJ*$T<|DXE*AS<9Hzf3ilf vma#Um_OVW8oxwVf^$MFOn=e}?TMpX+w&&~y?7{5$>=W5nOjh8KXFLc19pE0k delta 82 zcmX>ta6n+gc@{o3*SwO{B88HSRD~$dfXNS77O?~a8Jqi9%b3)^v4*l1v(~dVvv#od lvQB0_$!5pq#1_Yv$hMX34!bJ52YU*88~fbJ+8pwX+W>J)865xs diff --git a/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64_x86_64-simulator/SquareInAppPaymentsSDK.framework/SQIPAssetFinderResources.bundle/en-GB.lproj/Localizable.strings b/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64_x86_64-simulator/SquareInAppPaymentsSDK.framework/SQIPAssetFinderResources.bundle/en-GB.lproj/Localizable.strings index ac9a3ba4f2b9e2979dfa5576ff67c78adc6902dc..18061e6fffb2401aefb369be83edd7120229f8ed 100755 GIT binary patch delta 69 zcmaDM@K#{MEf$u7{Nj?y_gEHkMg#y^$@wX%o10meG0AtZ_Oec5oxysJ&6zEbEtjo; Z?Fidzb`$nQ_FDFp?58GsaL6-01^|f_ z2Nbgy1ug?87zJwuk_DXwp#`P|s|B_N(*`yMQwDAZaR$Z)=?5eSUk8K-zX$Y_Z3rI$ E1+0)DCjbBd delta 92 zcmeAd>=oSbm__N<%5;-2fRM5pVzi delta 58 zcmbQvF^OY?H4{s4lxM(Z7p7=N79c}m@?vIdNqZ(|rYxo&rWs5ZnBFkUG8;0RGY2!5 NG51dX&MeQk4FJiH50U@? diff --git a/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64_x86_64-simulator/SquareInAppPaymentsSDK.framework/SQIPCardEntryViewResources.bundle/en-CA.lproj/Localizable.strings b/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64_x86_64-simulator/SquareInAppPaymentsSDK.framework/SQIPCardEntryViewResources.bundle/en-CA.lproj/Localizable.strings index 96dc27b0dca1e48aac97067f0a5c7a1136e37502..2d9f1876797ec751a9888db3da73c6b99a53e76d 100755 GIT binary patch delta 105 zcmbQlF_&Y5H4{&CKz?yaVva&`eoE?Qd!_(JK~2}ZlGGxFl8jV^03~6gB+BGQp^VdC(suS delta 68 zcmbQsF^OY?H4{s4lxM(ZccuVFJ~h|8lGGxFl8jUZpxERU%r=ttOwLSMOg&69m@Y8A XVU}e!WHx6GW-epyo&1+so^cxhn#U6> diff --git a/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64_x86_64-simulator/SquareInAppPaymentsSDK.framework/SQIPCardEntryViewResources.bundle/en-GB.lproj/Localizable.strings b/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64_x86_64-simulator/SquareInAppPaymentsSDK.framework/SQIPCardEntryViewResources.bundle/en-GB.lproj/Localizable.strings index d796e7e58323e26659571e8b315bb411c3dce8d9..ac5c728bd41527d09b4e02b6132d031ab901c604 100755 GIT binary patch delta 63 zcmdnRv7cjuH4|q;S&BuT@i72|yAr?v delta 58 zcmdnbv5RAaH4{s4lxM(Z7p7)L79c}m@@ZykNqZ(=rV^$FOlz2)Ff%Y4GP^Q+Gp938 NVct4fo<*MV9suAi4}Jgu diff --git a/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64_x86_64-simulator/SquareInAppPaymentsSDK.framework/SQIPCardEntryViewResources.bundle/en-IE.lproj/Localizable.strings b/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64_x86_64-simulator/SquareInAppPaymentsSDK.framework/SQIPCardEntryViewResources.bundle/en-IE.lproj/Localizable.strings index 0b0e3bb233edcdd5aa49d33df3087fe537917e6b..fca2e84e8af89e03e4cbaba73bc634a3e5ebda2f 100755 GIT binary patch delta 72 zcmeC;=;hd8&BPJznpu>bpOU)Sp2>rePt`TAB(+GPBqLP;C_Z@_v$do%lRHxuQxDS& brVC7Om}Qv_na!E~nTwb^C%| delta 69 zcmeC>=;GL5&BPKMMgJ6R^gVhFq3{DzkmsL+TG6*&3F-S9TG3cJ~)qnrw2~1*>xmlta Fc>&;)5%vH8 delta 47 zcmaFK@tkAB4Q542gJ6R^gVhFq3{DtimsL+TG6*+_XNY3(WC$?W3=};%`8RVeBR2r6 CmJu=l diff --git a/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64_x86_64-simulator/SquareInAppPaymentsSDK.framework/setup b/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64_x86_64-simulator/SquareInAppPaymentsSDK.framework/setup index c27b1ab..3896607 100755 --- a/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64_x86_64-simulator/SquareInAppPaymentsSDK.framework/setup +++ b/XCFrameworks/SquareInAppPaymentsSDK.xcframework/ios-arm64_x86_64-simulator/SquareInAppPaymentsSDK.framework/setup @@ -8,10 +8,20 @@ IFS=$(echo "") IAP_SDK_FRAMEWORKS=("SquareInAppPaymentsSDK" "SquareBuyerVerificationSDK") MAIN_FRAMEWORKS_DIR="$BUILT_PRODUCTS_DIR/$FRAMEWORKS_FOLDER_PATH" +SECONDARY_FRAMEWORKS_DIR="$CONFIGURATION_BUILD_DIR" # Unpack frameworks for FRAMEWORK_NAME in "${IAP_SDK_FRAMEWORKS[@]}"; do - NESTED_FRAMEWORKS_DIR="$MAIN_FRAMEWORKS_DIR/$FRAMEWORK_NAME.framework/Frameworks" + FRAMEWORK_PATH="$FRAMEWORK_NAME.framework/Frameworks" + MAIN_NESTED_FRAMEWORKS_DIR="$MAIN_FRAMEWORKS_DIR/$FRAMEWORK_PATH" + SECONDARY_NESTED_FRAMEWORKS_DIR="$SECONDARY_FRAMEWORKS_DIR/$FRAMEWORK_PATH" + + if [ -d "$MAIN_NESTED_FRAMEWORKS_DIR" ]; then + NESTED_FRAMEWORKS_DIR=$MAIN_NESTED_FRAMEWORKS_DIR + else + NESTED_FRAMEWORKS_DIR=$SECONDARY_NESTED_FRAMEWORKS_DIR + fi + if [ -d "$NESTED_FRAMEWORKS_DIR" ]; then # Handle all nested frameworks that are fat frameworks find "$NESTED_FRAMEWORKS_DIR" -name '*.framework' ! -path '*.xcframework/*' -type d | while read -r FRAMEWORK; do @@ -57,6 +67,24 @@ for FRAMEWORK_NAME in "${IAP_SDK_FRAMEWORKS[@]}"; do fi done +# Workaround for Swift Package Manager +SOURCE_PACKAGE_FRAMEWORK_DIR="${BUILD_DIR%Build/*}SourcePackages/checkouts/in-app-payments-ios/XCFrameworks" + +if [ -d "$SOURCE_PACKAGE_FRAMEWORK_DIR" ]; then + for FRAMEWORK_NAME in "${IAP_SDK_FRAMEWORKS[@]}"; do + FRAMEWORK_PATH="$FRAMEWORK_NAME.xcframework" + SOURCE_FRAMEWORK_NESTED_DIR="$SOURCE_PACKAGE_FRAMEWORK_DIR/$FRAMEWORK_PATH" + # Find root directory inside of regular and simulator folders + find "$SOURCE_FRAMEWORK_NESTED_DIR" -name '*.framework' ! -path '*.framework/Frameworks/*' -type d | while read -r FRAMEWORK_DIR; do + rm -rf "$FRAMEWORK_DIR/Frameworks" + # Delete the setup script if archiving + if [ "$ACTION" = "install" ]; then + rm -rf "$FRAMEWORK_DIR/setup" + fi + done + done +fi + IFS=$OLDIFS # Don't choke if projects or targets have spaces in the name @@ -77,4 +105,4 @@ find "${CODESIGNING_FOLDER_PATH}/Frameworks" -name "*.framework" | while read -r fi done -IFS=$OLDIFS +IFS=$OLDIFS \ No newline at end of file From 8799744c4bbf7ab93ef8557203331f20b2f49d70 Mon Sep 17 00:00:00 2001 From: Brandon Jenniges Date: Mon, 27 Mar 2023 14:39:32 -0500 Subject: [PATCH 2/6] Update README.md --- README.md | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 5d35647..0c72085 100644 --- a/README.md +++ b/README.md @@ -3,23 +3,13 @@ # Square In-App Payments iOS SDK -Build remarkable payments experiences in your own apps with Square’s [In-App Payments SDK](https://docs.connect.squareup.com/payments/in-app-payments-sdk/what-it-does). Use our pre-built UI to collect sensitive credit card details from your customers, while matching the look and feel of your app. Square takes care of all the complexity of payments - security, risk, and PCI compliance are managed for you, so that you can focus on building the rest of your application. +Build remarkable payments experiences in your own apps with Square’s [In-App Payments SDK](https://developer.squareup.com/docs/in-app-payments-sdk/what-it-does). Use our pre-built UI to collect sensitive credit card details from your customers, while matching the look and feel of your app. Square takes care of all the complexity of payments - security, risk, and PCI compliance are managed for you, so that you can focus on building the rest of your application. You can also pair our Square In-App Payments SDK with Square’s [Online Payments APIs](https://squareup.com/developers/online-payment-apis) and [Reader SDK](https://squareup.com/developers/reader-sdk) to accept payments across all channels - online, in-person and in-app - while keeping your back office reporting unified in a single system. ## Installation -### Add frameworks - -#### SPM - -[Swift Package Manager](https://www.swift.org/package-manager/) support is available for Swift 5.3 and above. Simply add the following to your top-level `dependencies` block within your `Package.swift`: - -```swift -dependencies: [ - .package(url: "https://github.com/square/in-app-payments-ios", .upToNextMajor(from: "1.6.0")), -] -``` +### 1. Add frameworks #### Cocoapods @@ -39,16 +29,41 @@ Install with [Carthage](https://github.com/Carthage/Carthage) by adding the foll github "square/in-app-payments-ios" ``` -## Add build phase to setup the SquareInAppPaymentsSDK and/or SquareBuyerVerificationSDK framework ## +### 2. Add build phase to setup the SquareInAppPaymentsSDK and/or SquareBuyerVerificationSDK framework ### After adding the framework using any of the above methods, follow the below instructions to complete the setup. On your application targets’ Build Phases settings tab, click the + icon and choose New Run Script Phase. Create a Run Script in which you specify your shell (ex: /bin/sh), add the following contents to the script area below the shell: + ``` FRAMEWORKS="${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}" "${FRAMEWORKS}/SquareInAppPaymentsSDK.framework/setup" ``` +## Swift Package Manager + +[Swift Package Manager](https://www.swift.org/package-manager/) support is available for Swift 5.3 and above but is currently not the recommended method for using Square In-App Payments. + +### 1. Add the following to your top-level `dependencies` block within your `Package.swift`: + +```swift +dependencies: [ + .package(url: "https://github.com/square/in-app-payments-ios", .upToNextMajor(from: "1.6.0")), +] +``` + +### 2. Add build phase to setup the SquareInAppPaymentsSDK and/or SquareBuyerVerificationSDK framework ### + +On your application targets’ Build Phases settings tab, click the + icon and choose New Run Script Phase. Create a Run Script in which you specify your shell (ex: /bin/sh), add the following contents to the script area below the shell: + +``` +SETUP_SCRIPT="${CONFIGURATION_BUILD_DIR}/SquareInAppPaymentsSDK.framework/setup" +if [ -f "$SETUP_SCRIPT" ]; then + "$SETUP_SCRIPT" +fi +``` + +**Note:** Because of the build phase script, when switching between a debug build and release build (archiving), deleting the Derived Data may be necessary to prevent errors during building or releasing. ### Getting Started -For more information and setup instructions, please visit the [Square In-App Payments iOS SDK page](https://docs.connect.squareup.com/payments/in-app-payments-sdk/build-on-ios). +For more information and setup instructions, please visit the [Square In-App Payments iOS SDK page](https://developer.squareup.com/docs/in-app-payments-sdk/build-on-ios). \ No newline at end of file From 8d3de67887de2805ac13df28258e76011c199702 Mon Sep 17 00:00:00 2001 From: Brandon Jenniges Date: Tue, 28 Mar 2023 09:37:10 -0500 Subject: [PATCH 3/6] Update podspec_constants version and README.md --- README.md | 2 +- podspec_constants.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0c72085..cdd28ed 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ FRAMEWORKS="${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}" ## Swift Package Manager -[Swift Package Manager](https://www.swift.org/package-manager/) support is available for Swift 5.3 and above but is currently not the recommended method for using Square In-App Payments. +[Swift Package Manager](https://www.swift.org/package-manager/) support is available for Swift 5.3 and above but is currently not the recommended method for adding the Square In-App Payments SDK dependency. ### 1. Add the following to your top-level `dependencies` block within your `Package.swift`: diff --git a/podspec_constants.rb b/podspec_constants.rb index 86fe8ee..1a920ce 100644 --- a/podspec_constants.rb +++ b/podspec_constants.rb @@ -1,5 +1,5 @@ module SquareInAppPaymentsSDK - VERSION = '1.6.0' + VERSION = '1.6.1' LICENSE_TYPE = 'Square Developer License' LICENSE_TEXT = <<-LICENSE Copyright (c) 2018-present, Square, Inc. All rights reserved. From 73a86b65257d48753d3c494df3f71322c37303cc Mon Sep 17 00:00:00 2001 From: Brandon Jenniges Date: Tue, 28 Mar 2023 11:17:05 -0500 Subject: [PATCH 4/6] Update READEME.md --- README.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index cdd28ed..a46791c 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,8 @@ FRAMEWORKS="${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}" "${FRAMEWORKS}/SquareInAppPaymentsSDK.framework/setup" ``` +Make sure the above run script is below any `[CP] Embed Pods Frameworks` or `Embed Frameworks` Build Phase. + ## Swift Package Manager [Swift Package Manager](https://www.swift.org/package-manager/) support is available for Swift 5.3 and above but is currently not the recommended method for adding the Square In-App Payments SDK dependency. @@ -47,7 +49,7 @@ FRAMEWORKS="${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}" ```swift dependencies: [ - .package(url: "https://github.com/square/in-app-payments-ios", .upToNextMajor(from: "1.6.0")), + .package(url: "https://github.com/square/in-app-payments-ios", .upToNextMajor(from: "1.6.1")), ] ``` @@ -62,8 +64,12 @@ if [ -f "$SETUP_SCRIPT" ]; then fi ``` -**Note:** Because of the build phase script, when switching between a debug build and release build (archiving), deleting the Derived Data may be necessary to prevent errors during building or releasing. +**Important Note:** The build phase script requires you to reset your Swift Package cache when switching from a debug build to a release build (archiving) or vice versa. This helps prevent errors during building or releasing. You can reset your cache by using `File -> Packages -> Reset Package Cache`in Xcode. + +### iPhone and iPad apps on Mac with Apple silicon + +Square In-App Payments iOS SDK currently does not support iPhone and iPad apps on Mac with Apple silicon. ### Getting Started -For more information and setup instructions, please visit the [Square In-App Payments iOS SDK page](https://developer.squareup.com/docs/in-app-payments-sdk/build-on-ios). \ No newline at end of file +For more information and setup instructions, please visit the [Square In-App Payments iOS SDK page](https://developer.squareup.com/docs/in-app-payments-sdk/build-on-ios). From 36284c849b25b8982550c8f2fe4039ba99e69014 Mon Sep 17 00:00:00 2001 From: Brandon Jenniges Date: Tue, 28 Mar 2023 12:39:02 -0500 Subject: [PATCH 5/6] Update READEME.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a46791c..1556ba3 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ if [ -f "$SETUP_SCRIPT" ]; then fi ``` -**Important Note:** The build phase script requires you to reset your Swift Package cache when switching from a debug build to a release build (archiving) or vice versa. This helps prevent errors during building or releasing. You can reset your cache by using `File -> Packages -> Reset Package Cache`in Xcode. +**Important Note:** The build phase script requires you to reset your Swift Package Caches when switching from a debug build to a release build (archiving) or vice versa. This helps prevent errors during building or releasing. You can reset your cache by using `File -> Packages -> Reset Package Caches` in Xcode. ### iPhone and iPad apps on Mac with Apple silicon From fa3e366f7a75ec3325e422270134216d6b357d14 Mon Sep 17 00:00:00 2001 From: Brandon Jenniges Date: Tue, 28 Mar 2023 16:59:28 -0500 Subject: [PATCH 6/6] Add SPM_README.md --- README.md | 22 ++-------------------- SPM_README.md | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 20 deletions(-) create mode 100644 SPM_README.md diff --git a/README.md b/README.md index 1556ba3..dd36dab 100644 --- a/README.md +++ b/README.md @@ -43,28 +43,10 @@ Make sure the above run script is below any `[CP] Embed Pods Frameworks` or `Emb ## Swift Package Manager -[Swift Package Manager](https://www.swift.org/package-manager/) support is available for Swift 5.3 and above but is currently not the recommended method for adding the Square In-App Payments SDK dependency. +[Swift Package Manager](https://www.swift.org/package-manager/) support is available for Swift 5.3 and above but is currently **not** the recommended method for adding the Square In-App Payments SDK dependency. -### 1. Add the following to your top-level `dependencies` block within your `Package.swift`: +Setup instructions can be found [here](SPM_README.md). -```swift -dependencies: [ - .package(url: "https://github.com/square/in-app-payments-ios", .upToNextMajor(from: "1.6.1")), -] -``` - -### 2. Add build phase to setup the SquareInAppPaymentsSDK and/or SquareBuyerVerificationSDK framework ### - -On your application targets’ Build Phases settings tab, click the + icon and choose New Run Script Phase. Create a Run Script in which you specify your shell (ex: /bin/sh), add the following contents to the script area below the shell: - -``` -SETUP_SCRIPT="${CONFIGURATION_BUILD_DIR}/SquareInAppPaymentsSDK.framework/setup" -if [ -f "$SETUP_SCRIPT" ]; then - "$SETUP_SCRIPT" -fi -``` - -**Important Note:** The build phase script requires you to reset your Swift Package Caches when switching from a debug build to a release build (archiving) or vice versa. This helps prevent errors during building or releasing. You can reset your cache by using `File -> Packages -> Reset Package Caches` in Xcode. ### iPhone and iPad apps on Mac with Apple silicon diff --git a/SPM_README.md b/SPM_README.md new file mode 100644 index 0000000..34d8e86 --- /dev/null +++ b/SPM_README.md @@ -0,0 +1,22 @@ +## Swift Package Manager + +### 1. Add the following to your top-level `dependencies` block within your `Package.swift`: + +```swift +dependencies: [ + .package(url: "https://github.com/square/in-app-payments-ios", .upToNextMajor(from: "1.6.1")), +] +``` + +### 2. Add build phase to setup the SquareInAppPaymentsSDK and/or SquareBuyerVerificationSDK framework ### + +On your application targets’ Build Phases settings tab, click the + icon and choose New Run Script Phase. Create a Run Script in which you specify your shell (ex: /bin/sh), add the following contents to the script area below the shell: + +``` +SETUP_SCRIPT="${CONFIGURATION_BUILD_DIR}/SquareInAppPaymentsSDK.framework/setup" +if [ -f "$SETUP_SCRIPT" ]; then + "$SETUP_SCRIPT" +fi +``` + +**Important Note:** The build phase script requires you to reset your Swift Package Caches when switching from a debug build to a release build (archiving) or vice versa. This helps prevent errors during building or releasing. You can reset your cache by using `File -> Packages -> Reset Package Caches` in Xcode. \ No newline at end of file