Merge branch 'master' into bn/feature/ACC-4508-Expose-ApplePay-Shippi…

…ng-Options # Conflicts: # Debug App/Podfile.lock # Debug App/Resources/Localized Views/Base.lproj/Main.storyboard
primer-io · Nov 21, 2024 · 11876b9 · 11876b9
2 parents 677b98e + 9cd8624
commit 11876b9
Show file tree

Hide file tree

Showing 30 changed files with 240 additions and 81 deletions.
diff --git a/.cz.toml b/.cz.toml
@@ -1,6 +1,6 @@
 [tool.commitizen]
 version_scheme = "semver"
-version = "2.31.3"
+version = "2.32.0"
 version_files = [
   "Sources/PrimerSDK/Classes/version.swift:let PrimerSDKVersion",
   "PrimerSDK.podspec:s.version"

diff --git a/.github/workflows/build-test-upload.yml b/.github/workflows/build-test-upload.yml
@@ -125,7 +125,7 @@ jobs:
       - uses: webfactory/ssh-agent@dc588b651fe13675774614f8e6a936a468676387 # v0.9.0
         with:
           ssh-private-key: ${{ secrets.SSH_KEY }}
-      - uses: ruby/setup-ruby@7d3497fd78c07c0d84ebafa58d8dac60cd1f0763  # v1.199.0
+      - uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc  # v1.202.0
         with:
           ruby-version: "3.2"
           bundler-cache: true
@@ -180,7 +180,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.ref }}
-      - uses: ruby/setup-ruby@7d3497fd78c07c0d84ebafa58d8dac60cd1f0763  # v1.199.0
+      - uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc  # v1.202.0
         with:
           ruby-version: "3.2"
           bundler-cache: true

diff --git a/.github/workflows/pod_lint.yml b/.github/workflows/pod_lint.yml
@@ -22,7 +22,7 @@ jobs:
         with:
           access_token: ${{ github.token }}
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: ruby/setup-ruby@7d3497fd78c07c0d84ebafa58d8dac60cd1f0763  # v1.199.0
+      - uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc  # v1.202.0
         with:
           ruby-version: "3.2"
           bundler-cache: true

diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
@@ -84,7 +84,7 @@ jobs:
         with:
           ssh-private-key: ${{ secrets.SSH_KEY }}
 
-      - uses: ruby/setup-ruby@7d3497fd78c07c0d84ebafa58d8dac60cd1f0763  # v1.199.0
+      - uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc  # v1.202.0
         with:
           ruby-version: "3.2"
           bundler-cache: true

diff --git a/.github/workflows/xcode-versions-build.yml b/.github/workflows/xcode-versions-build.yml
@@ -38,7 +38,7 @@ jobs:
       - uses: webfactory/ssh-agent@dc588b651fe13675774614f8e6a936a468676387 # v0.9.0
         with:
           ssh-private-key: ${{ secrets.SSH_KEY }}
-      - uses: ruby/setup-ruby@7d3497fd78c07c0d84ebafa58d8dac60cd1f0763  # v1.199.0
+      - uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc  # v1.202.0
         with:
           ruby-version: "3.2"
           bundler-cache: true
@@ -77,7 +77,7 @@ jobs:
           node Report\ Scripts/multixcode-failure-report.js createMultiXcodeFailureReport ${{ github.head_ref || github.ref_name }} ${{ matrix.xcode}} ${{ matrix.variant }}
       - name: Slack Notification
         if: ${{ failure() }}
-        uses: slackapi/slack-github-action@37ebaef184d7626c5f204ab8d3baff4262dd30f0 #v1.27.0
+        uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d #v2.0.0
         with:
           channel-id: ${{ secrets.SLACK_MOBILE_SDK_CHANNEL }}
           payload-file-path: '/var/tmp/multixcode-failure-report.json'
@@ -103,7 +103,7 @@ jobs:
           node Report\ Scripts/multixcode-success-report.js createMultiXcodeSummaryReport ${{ github.head_ref || github.ref_name }} "14.3.1, 14.2, 14.1" "cocoapods, spm"
       - name: Slack Notification
         if: ${{ success() }}
-        uses: slackapi/slack-github-action@37ebaef184d7626c5f204ab8d3baff4262dd30f0 #v1.27.0
+        uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d #v2.0.0
         with:
           channel-id: ${{ secrets.SLACK_MOBILE_SDK_CHANNEL }}
           payload-file-path: '/var/tmp/multixcode-success-summary.json'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 2.32.0 (2024-11-13)
+
+### Feat
+
+- Add additional dismissal controls to PrimerUIOptions
+
+### Fix
+
+- Range or index out of bounds crash (#1041)
+- Crash in InternalCardComponentsManager (#1042)
+
 ## 2.31.3 (2024-10-24)
 
 ### Fix

diff --git a/Debug App/Podfile.lock b/Debug App/Podfile.lock
@@ -4,9 +4,9 @@ PODS:
   - PrimerIPay88MYSDK (0.1.7)
   - PrimerKlarnaSDK (1.1.1)
   - PrimerNolPaySDK (1.0.1)
-  - PrimerSDK (2.31.3):
-    - PrimerSDK/Core (= 2.31.3)
-  - PrimerSDK/Core (2.31.3)
+  - PrimerSDK (2.32.0):
+    - PrimerSDK/Core (= 2.32.0)
+  - PrimerSDK/Core (2.32.0)
   - PrimerStripeSDK (1.0.0)
 
 DEPENDENCIES:
@@ -37,7 +37,7 @@ SPEC CHECKSUMS:
   PrimerIPay88MYSDK: 436ee0be7e2c97e4e81456ccddee20175e9e3c4d
   PrimerKlarnaSDK: 564105170cc7b467bf95c31851813ea41c468f8b
   PrimerNolPaySDK: 08b140ed39b378a0b33b4f8746544a402175c0cc
-  PrimerSDK: 97197b708f58d992aaa40163bc3f3ba58fa8a2e6
+  PrimerSDK: db06e6553747bdadf8a8ca276d556745af38bba3
   PrimerStripeSDK: c37d4e7c1b5256d67d4890c4cc4b38ddc9427489
 
 PODFILE CHECKSUM: fa17ead44d40b0b09abc2f30a5cc3d8aefe389e1

diff --git a/Debug App/Primer.io Debug App.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Debug App/Primer.io Debug App.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/primer-io/primer-sdk-3ds-ios",
         "state": {
           "branch": null,
-          "revision": "ac3be93adcc4d054eef7baf0f4d364cd3525dbf7",
-          "version": "2.3.2"
+          "revision": "ed6a5ae7a3b514919d2a1737e08c552737c58110",
+          "version": "2.4.0"
         }
       },
       {