Merge pull request #792 from Adyen/develop

Release 4.7.0
Adyen · Feb 10, 2022 · 8a30d2b · 8a30d2b
2 parents 4875d9a + 6554b2f
commit 8a30d2b
Show file tree

Hide file tree

Showing 575 changed files with 28,071 additions and 6,187 deletions.
diff --git a/.github/workflows/publish-demo-app.yml b/.github/workflows/publish-demo-app.yml
@@ -0,0 +1,67 @@
+name: Publish Demo App
+on: [workflow_dispatch]
+jobs:
+
+  Publish:
+    runs-on: macos-11
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - uses: n1hility/cancel-previous-runs@v2
+      with:
+        token: ${{ secrets.MANUAL_ACTION_TOKEN }}
+
+    - name: Select latest Xcode
+      uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: latest-stable
+
+    - name: Install the Apple certificate and provisioning profile
+      env:
+        BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
+        DEVELOPMENT_CERTIFICATE_BASE64: ${{ secrets.DEVELOPMENT_CERTIFICATE_BASE64 }}
+        P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
+        BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_BASE64 }}
+        KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+      run: |
+        # create variables
+        CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
+        DEV_CERTIFICATE_PATH=$RUNNER_TEMP/dev_certificate.p12
+        PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision
+        KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
+
+        # import certificate and provisioning profile from secrets
+        echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode --output $CERTIFICATE_PATH
+        echo -n "$DEVELOPMENT_CERTIFICATE_BASE64" | base64 --decode --output $DEV_CERTIFICATE_PATH
+        echo -n "$BUILD_PROVISION_PROFILE_BASE64" | base64 --decode --output $PP_PATH
+
+        # create temporary keychain
+        security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+        security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
+        security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+
+        # import release certificate to keychain
+        security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
+        security import $DEV_CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
+        security list-keychain -d user -s $KEYCHAIN_PATH
+
+        # apply provisioning profile
+        mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
+        cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
+    - name: Configure Demo App
+      env:
+        CLIENT_KEY: ${{ secrets.DEMO_APP_TEST_ENV_CLIENT_KEY }}
+        DEMO_SERVER_API_KEY: ${{ secrets.DEMO_SERVER_TEST_ENV_API_KEY }}
+      run: |
+        # client Key
+        sed -i '' "s/static let clientKey.*$/static let clientKey = \"$CLIENT_KEY\"/g" ./Demo/Configuration.swift
+
+        # demo server API key
+        sed -i '' "s/static let demoServerAPIKey.*$/static let demoServerAPIKey = \"$DEMO_SERVER_API_KEY\"/g" ./Demo/Configuration.swift
+    - name: Publish Demo App
+      env:
+        APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
+        APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
+      run: |
+        ./Scripts/publish-demo-app.sh "$APPLE_ID_USERNAME" "$APPLE_APP_SPECIFIC_PASSWORD"
diff --git a/.gitignore b/.gitignore
@@ -18,7 +18,7 @@ xcuserdata
 *.xcscmblueprint
 
 ## Build generated
-[Bb]uild/
+[Bb]uild*
 DerivedData
 
 # macOS

diff --git a/.jazzy.yaml b/.jazzy.yaml
@@ -27,8 +27,6 @@ custom_categories:
       - CornerRounding
       - ToolbarMode
       - FormComponentStyle
-      - FormHeaderStyle
-      - FormFooterStyle
       - FormTextItemStyle
       - FormToggleItemStyle
       - FormButtonItemStyle
@@ -54,7 +52,6 @@ custom_categories:
       - StoredPaymentMethod
       - StoredCardPaymentMethod
       - StoredBCMCPaymentMethod
-      - StoredPayPalPaymentMethod
       - StoredBLIKPaymentMethod
       - StoredPayPalPaymentMethod
       - AnyCardPaymentMethod
@@ -64,6 +61,7 @@ custom_categories:
       - ApplePayPaymentMethod
       - SEPADirectDebitPaymentMethod
       - BACSDirectDebitPaymentMethod
+      - ACHDirectDebitPaymentMethod
       - QiwiWalletPaymentMethod
       - AffirmPaymentMethod
       - AwaitPaymentMethod
@@ -90,17 +88,14 @@ custom_categories:
       - GenericVoucherAction
       - VoucherAction
       - DokuVoucherAction
-      - EContextATMVoucherAction
-      - EContextStoresVoucherAction
       - MultibancoVoucherAction
-      - QRCodeAction
-      - SDKAction
-      - WeChatPaySDKAction
       - BoletoVoucherAction
-      - DokuVoucherAction
       - EContextATMVoucherAction
       - EContextStoresVoucherAction
       - OXXOVoucherAction
+      - QRCodeAction
+      - SDKAction
+      - WeChatPaySDKAction
       - DocumentAction
       - AppleWalletError
 
@@ -175,6 +170,12 @@ custom_categories:
       - BACSDirectDebitPaymentMethod
       - BACSDirectDebitComponent
       - BACSDirectDebitDetails
+
+  - name: ACH Direct Debit Component
+    children:
+      - ACHDirectDebitPaymentMethod
+      - ACHDirectDebitComponent
+      - ACHDirectDebitDetails
 
   - name: Qiwi Wallet Component
     children:
@@ -258,7 +259,6 @@ custom_categories:
       - ActionComponent
       - FinalizableComponent
       - PaymentAwareComponent
-      - PartialPaymentComponent
       - PartialPaymentError
       - Details
       - AdditionalDetails
@@ -279,14 +279,12 @@ custom_categories:
       - Payment
       - Amount
       - Balance
-      - PaymentOrder
       - ShopperName
       - PostalAddress
       - ShopperInteraction
       - DisplayInformation
       - CardFundingSource
       - BrowserInfo
-      - ShopperName
       - ShopperInformation
       - PrefilledShopperInformation
       - PartialPaymentOrder
@@ -296,6 +294,7 @@ custom_categories:
   - name: Encryption
     children:
       - CardEncryptor
+      - BankDetailsEncryptor
       - Card
       - EncryptedCard
       - EncryptionError
@@ -310,7 +309,6 @@ custom_categories:
       - Validator
       - DateValidator
       - LengthValidator
-      - Environment
       - LogoURLProvider
       - SecuredViewController
       - Localizable

diff --git a/Adyen.podspec b/Adyen.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'Adyen'
-  s.version = '4.6.1'
+  s.version = '4.7.0'
   s.summary = "Adyen Components for iOS"
   s.description = <<-DESC
     Adyen Components for iOS allows you to accept in-app payments by providing you with the building blocks you need to create a checkout experience.
@@ -28,15 +28,10 @@ Pod::Spec.new do |s|
 
   # Payment Methods
   s.subspec 'WeChatPay' do |plugin|
-    plugin.source_files = 'AdyenWeChatPay/**/*.swift', 'AdyenWeChatPay/WeChatSDK/*.h'
-    plugin.private_header_files = 'AdyenWeChatPay/WeChatSDK/*.h'
-    plugin.vendored_libraries = 'AdyenWeChatPay/WeChatSDK/libWeChatSDK.a'
-    plugin.xcconfig = { 'SWIFT_INCLUDE_PATHS' => '${PODS_TARGET_SRCROOT}/AdyenWeChatPay/WeChatSDK', 'OTHER_LDFLAGS' => '-ObjC -all_load', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
-    plugin.preserve_paths = 'AdyenWeChatPay/WeChatSDK/module.modulemap'
+    plugin.source_files = 'AdyenWeChatPay/**/*.swift'
     plugin.dependency 'Adyen/Core'
     plugin.dependency 'Adyen/Actions'
-    plugin.libraries = 'z', 'stdc++', 'sqlite3.0'
-    plugin.frameworks = 'SystemConfiguration', 'CoreTelephony', 'CFNetwork', 'CoreGraphics', 'Security'
+    plugin.dependency 'AdyenWeChatPayInternal', '2.1.0'
   end
 
   s.subspec 'Card' do |plugin|
@@ -54,6 +49,7 @@ Pod::Spec.new do |s|
 
   s.subspec 'Components' do |plugin|
     plugin.dependency 'Adyen/Core'
+    plugin.dependency 'Adyen/Encryption'
     plugin.source_files = 'AdyenComponents/**/*.swift'
   end