Merge pull request #116 from checkout/develop

Release 3.5.1
checkout · Oct 19, 2021 · a3b1732 · a3b1732
2 parents 71b39a9 + b01fedc
commit a3b1732
Show file tree

Hide file tree

Showing 164 changed files with 1,865 additions and 659 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 
 #### 3.x Releases
 
+## [3.5.1](https://github.com/checkout/frames-ios/releases/tag/3.5.1)
+
+Released on 2021-10-19.
+
+#### Fixed
+
+* `Localizable.strings` issue when used with Cocoapods as a static library.
+* Compilation issue for simulator release builds with Swift Package Manager.
+
 ## [3.5.0](https://github.com/checkout/frames-ios/releases/tag/3.5.0)
 
 Released on 2021-09-29.

diff --git a/Frames.podspec b/Frames.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Frames"
-  s.version      = "3.5.0"
+  s.version      = "3.5.1"
   s.summary      = "Checkout API Client, Payment Form UI and Utilities in Swift"
   s.description  = <<-DESC
   Checkout API Client and Payment Form Utilities in Swift.
@@ -15,21 +15,17 @@ Pod::Spec.new do |s|
 
   s.source_files = 'Source/**/*.swift'
   s.exclude_files = "Classes/Exclude"
-  s.resources = 'Source/Resources/**/*'
+  s.resource_bundles = {
+		'Frames' => ['Source/Resources/**/*']
+	}
 
-  s.dependency 'PhoneNumberKit', '~> 3.3'
-  s.dependency 'CheckoutEventLoggerKit', '~> 1.0'
+  s.dependency 'PhoneNumberKit', '3.3.3'
+  s.dependency 'CheckoutEventLoggerKit', '1.1.1'
 
   s.test_spec do |t|
     t.source_files = 'Tests/**/*.swift'
     t.resources = 'Tests/Fixtures/*'
     t.requires_app_host = true
+    t.scheme = { :environment_variables => { 'COCOAPODS' => true }}
   end
-
-  s.pod_target_xcconfig = {
-    'VALID_ARCHS' => 'arm64 armv7 x86_64',
-    'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386'
-  }
-
-  s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
 end
diff --git a/Package.resolved b/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/checkout/checkout-event-logger-ios-framework.git",
         "state": {
           "branch": null,
-          "revision": "d3f87cede558cf229912ceaabe2f4ba3b8cb1e3d",
-          "version": "1.0.3"
+          "revision": "917efddacf253a09c17921d268c0aa817a5011d5",
+          "version": "1.1.1"
         }
       },
       {

diff --git a/Package.swift b/Package.swift
@@ -15,13 +15,24 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/marmelroy/PhoneNumberKit.git", from: "3.3.0"),
-        .package(name: "CheckoutEventLoggerKit", url: "https://github.com/checkout/checkout-event-logger-ios-framework.git", from: "1.0.3")
+        .package(
+            name: "PhoneNumberKit",
+            url: "https://github.com/marmelroy/PhoneNumberKit.git",
+            from: "3.3.3"
+        ),
+        .package(
+            name: "CheckoutEventLoggerKit",
+            url: "https://github.com/checkout/checkout-event-logger-ios-framework.git",
+            from: "1.1.1"
+        )
     ],
     targets: [
         .target(
             name: "Frames",
-            dependencies: ["PhoneNumberKit", "CheckoutEventLoggerKit"],
+            dependencies: [
+                "PhoneNumberKit",
+                "CheckoutEventLoggerKit"
+            ],
             path: "Source",
             exclude: ["Suppporting Files/Info.plist"],
             resources: [

diff --git a/README.md b/README.md
@@ -69,8 +69,6 @@ Then, run the following command:
 $ pod install
 ```
 
-We do not support i386 builds. Cocoapods should configure this for you, but if not, see [Architecture Support](#architecture-support) for setup.
-
 ### Carthage
 
 [Carthage](https://github.com/Carthage/Carthage) is a decentralized dependency manager that builds your dependencies and provides you with binary frameworks.
@@ -90,8 +88,6 @@ github "checkout/frames-ios" ~> 3
 
 Run `carthage update --use-xcframeworks` to build the framework and drag the built `Frames` into your Xcode project.
 
-If you are planning to run release builds for simulator, make sure to exclude the i386 architecture from your builds. See [Architecture Support](#architecture-support) for setup.
-
 ### Swift Package Manager
 
 [Swift Package Manager](https://swift.org/package-manager/) is a tool for automating the distribution of Swift code and is integrated into the swift compiler.
@@ -104,8 +100,6 @@ dependencies: [
 ]
 ```
 
-If you are planning to run release builds for simulator, make sure to exclude the i386 architecture from your builds. See [Architecture Support](#architecture-support) for setup.
-
 ## Usage
 
 Import the SDK:
@@ -370,7 +364,7 @@ threeDSWebViewController.url = "http://example.com/3ds"
 threeDSWebViewController.delegate = self
 ```
 
-Handle the result by adding conformance to `CvvConfirmationViewControllerDelegate`.
+Handle the result by adding conformance to `ThreedsWebViewControllerDelegate`.
 
 ```swift
 extension ViewController: ThreedsWebViewControllerDelegate {
@@ -401,13 +395,6 @@ CheckoutTheme.chevronColor = .white
 CheckoutTheme.font = UIFont(name: "Chalkboard SE", size: 12)!
 ```
 
-## Architecture Support
-
-We support all available architectures in Xcode except i386.
-Cocoapods should handle this for you, but if this is not working or if you're using SPM or Carthage you will need to configure your excluded architectures in your build settings as below:
-
-![excluded architectures](screenshots/excludedArchitectures.png)
-
 ## License
 
 Frames iOS is released under the MIT license. [See LICENSE](https://github.com/checkout/frames-ios/blob/master/LICENSE) for details.
diff --git a/Source/Core/Constants.swift b/Source/Core/Constants.swift
@@ -1,7 +1,7 @@
 struct Constants {
 
     static let productName = "frames-ios-sdk"
-    static let version = "3.5.0"
+    static let version = "3.5.1"
     static let userAgent = "checkout-sdk-frames-ios/\(version)"
 
 }
diff --git a/Tests/Resources/ResourcesTests.swift b/Tests/Resources/ResourcesTests.swift
@@ -0,0 +1,38 @@
+//
+//  ResourcesTests.swift
+//  Frames-Unit-Tests
+//
+//  Created by Harry Brown on 12/10/2021.
+//
+
+import XCTest
+@testable import Frames
+
+final class ResourcesTests: XCTestCase {
+
+    func test_findExpectedResources() {
+
+        #if SWIFT_PACKAGE
+        let framesResourceBundlePath = "Frames_Frames"
+        #endif
+
+        #if COCOAPODS
+        let framesResourceBundlePath = "Frames"
+        #endif
+
+        let framesTopLevelBundle = Bundle(for: CheckoutAPIClient.self)
+        guard let framesResourceBundleURL = framesTopLevelBundle.url(forResource: framesResourceBundlePath, withExtension: "bundle") else {
+            XCTFail("could not find resource bundle url")
+            return
+        }
+
+        guard let framesResourceBundle = Bundle(url: framesResourceBundleURL) else {
+            XCTFail("could not find internal bundle")
+            return
+        }
+
+        XCTAssertEqual(framesResourceBundle.localizations.count, 6)
+        XCTAssertNotNil(framesResourceBundle.url(forResource: "icon-amex", withExtension: "png"))
+    }
+}
+
diff --git a/docs/Classes.html b/docs/Classes.html
@@ -21,7 +21,7 @@
     <header class="header">
       <p class="header-col header-col--primary">
         <a class="header-link" href="index.html">
-          Frames 3.5.0 Docs
+          Frames 3.5.1 Docs
         </a>
          (91% documented)
       </p>
@@ -887,8 +887,8 @@ <h4>Declaration</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://www.checkout.com/" target="_blank" rel="noopener" rel="external">Checkout.com</a>. All rights reserved. (Last updated: 2021-09-29)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="noopener" rel="external">jazzy ♪♫ v0.14.0</a>, a <a class="link" href="https://realm.io" target="_blank" rel="noopener" rel="external">Realm</a> project.</p>
+      <p>&copy; 2021 <a class="link" href="https://www.checkout.com/" target="_blank" rel="external noopener">Checkout.com</a>. All rights reserved. (Last updated: 2021-10-15)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="noopener" rel="external">jazzy ♪♫ v0.14.1</a>, a <a class="link" href="https://realm.io" target="_blank" rel="noopener" rel="external">Realm</a> project.</p>
     </section>
   </body>
 </div>

diff --git a/docs/Classes/AddressView.html b/docs/Classes/AddressView.html
@@ -21,7 +21,7 @@
     <header class="header">
       <p class="header-col header-col--primary">
         <a class="header-link" href="../index.html">
-          Frames 3.5.0 Docs
+          Frames 3.5.1 Docs
         </a>
          (91% documented)
       </p>
@@ -283,7 +283,7 @@ <h1>AddressView</h1>
                 <a name="//apple_ref/swift/Section/Initialization" class="dashAnchor"></a>
                 <div class="section-name-container">
                   <a class="section-name-link" href="#/Initialization"></a>
-                  <h3 class="section-name"><p>Initialization</p>
+                  <h3 class="section-name"><span>Initialization</span>
 </h3>
                 </div>
               </div>
@@ -356,8 +356,8 @@ <h4>Declaration</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://www.checkout.com/" target="_blank" rel="noopener" rel="external">Checkout.com</a>. All rights reserved. (Last updated: 2021-09-29)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="noopener" rel="external">jazzy ♪♫ v0.14.0</a>, a <a class="link" href="https://realm.io" target="_blank" rel="noopener" rel="external">Realm</a> project.</p>
+      <p>&copy; 2021 <a class="link" href="https://www.checkout.com/" target="_blank" rel="external noopener">Checkout.com</a>. All rights reserved. (Last updated: 2021-10-15)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="noopener" rel="external">jazzy ♪♫ v0.14.1</a>, a <a class="link" href="https://realm.io" target="_blank" rel="noopener" rel="external">Realm</a> project.</p>
     </section>
   </body>
 </div>

diff --git a/docs/Classes/AddressViewController.html b/docs/Classes/AddressViewController.html
@@ -21,7 +21,7 @@
     <header class="header">
       <p class="header-col header-col--primary">
         <a class="header-link" href="../index.html">
-          Frames 3.5.0 Docs
+          Frames 3.5.1 Docs
         </a>
          (91% documented)
       </p>
@@ -285,7 +285,7 @@ <h1>AddressViewController</h1>
                 <a name="//apple_ref/swift/Section/Properties" class="dashAnchor"></a>
                 <div class="section-name-container">
                   <a class="section-name-link" href="#/Properties"></a>
-                  <h3 class="section-name"><p>Properties</p>
+                  <h3 class="section-name"><span>Properties</span>
 </h3>
                 </div>
               </div>
@@ -358,7 +358,7 @@ <h4>Declaration</h4>
                 <a name="//apple_ref/swift/Section/Initialization" class="dashAnchor"></a>
                 <div class="section-name-container">
                   <a class="section-name-link" href="#/Initialization"></a>
-                  <h3 class="section-name"><p>Initialization</p>
+                  <h3 class="section-name"><span>Initialization</span>
 </h3>
                 </div>
               </div>
@@ -462,7 +462,7 @@ <h4>Declaration</h4>
                 <a name="//apple_ref/swift/Section/Lifecycle" class="dashAnchor"></a>
                 <div class="section-name-container">
                   <a class="section-name-link" href="#/Lifecycle"></a>
-                  <h3 class="section-name"><p>Lifecycle</p>
+                  <h3 class="section-name"><span>Lifecycle</span>
 </h3>
                 </div>
               </div>
@@ -595,7 +595,7 @@ <h4>Declaration</h4>
                 <a name="//apple_ref/swift/Section/Methods" class="dashAnchor"></a>
                 <div class="section-name-container">
                   <a class="section-name-link" href="#/Methods"></a>
-                  <h3 class="section-name"><p>Methods</p>
+                  <h3 class="section-name"><span>Methods</span>
 </h3>
                 </div>
               </div>
@@ -638,7 +638,7 @@ <h4>Declaration</h4>
                 <a name="//apple_ref/swift/Section/CountrySelectionViewControllerDelegate" class="dashAnchor"></a>
                 <div class="section-name-container">
                   <a class="section-name-link" href="#/CountrySelectionViewControllerDelegate"></a>
-                  <h3 class="section-name"><p>CountrySelectionViewControllerDelegate</p>
+                  <h3 class="section-name"><span>CountrySelectionViewControllerDelegate</span>
 </h3>
                 </div>
               </div>
@@ -681,7 +681,7 @@ <h4>Declaration</h4>
                 <a name="//apple_ref/swift/Section/UITextFieldDelegate" class="dashAnchor"></a>
                 <div class="section-name-container">
                   <a class="section-name-link" href="#/UITextFieldDelegate"></a>
-                  <h3 class="section-name"><p>UITextFieldDelegate</p>
+                  <h3 class="section-name"><span>UITextFieldDelegate</span>
 </h3>
                 </div>
               </div>
@@ -754,8 +754,8 @@ <h4>Declaration</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://www.checkout.com/" target="_blank" rel="noopener" rel="external">Checkout.com</a>. All rights reserved. (Last updated: 2021-09-29)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="noopener" rel="external">jazzy ♪♫ v0.14.0</a>, a <a class="link" href="https://realm.io" target="_blank" rel="noopener" rel="external">Realm</a> project.</p>
+      <p>&copy; 2021 <a class="link" href="https://www.checkout.com/" target="_blank" rel="external noopener">Checkout.com</a>. All rights reserved. (Last updated: 2021-10-15)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="noopener" rel="external">jazzy ♪♫ v0.14.1</a>, a <a class="link" href="https://realm.io" target="_blank" rel="noopener" rel="external">Realm</a> project.</p>
     </section>
   </body>
 </div>

diff --git a/docs/Classes/CardListCell.html b/docs/Classes/CardListCell.html
@@ -21,7 +21,7 @@
     <header class="header">
       <p class="header-col header-col--primary">
         <a class="header-link" href="../index.html">
-          Frames 3.5.0 Docs
+          Frames 3.5.1 Docs
         </a>
          (91% documented)
       </p>
@@ -283,7 +283,7 @@ <h1>CardListCell</h1>
                 <a name="//apple_ref/swift/Section/Properties" class="dashAnchor"></a>
                 <div class="section-name-container">
                   <a class="section-name-link" href="#/Properties"></a>
-                  <h3 class="section-name"><p>Properties</p>
+                  <h3 class="section-name"><span>Properties</span>
 </h3>
                 </div>
               </div>
@@ -386,7 +386,7 @@ <h4>Declaration</h4>
                 <a name="//apple_ref/swift/Section/Initialization" class="dashAnchor"></a>
                 <div class="section-name-container">
                   <a class="section-name-link" href="#/Initialization"></a>
-                  <h3 class="section-name"><p>Initialization</p>
+                  <h3 class="section-name"><span>Initialization</span>
 </h3>
                 </div>
               </div>
@@ -459,7 +459,7 @@ <h4>Declaration</h4>
                 <a name="//apple_ref/swift/Section/Methods" class="dashAnchor"></a>
                 <div class="section-name-container">
                   <a class="section-name-link" href="#/Methods"></a>
-                  <h3 class="section-name"><p>Methods</p>
+                  <h3 class="section-name"><span>Methods</span>
 </h3>
                 </div>
               </div>
@@ -551,8 +551,8 @@ <h4>Parameters</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://www.checkout.com/" target="_blank" rel="noopener" rel="external">Checkout.com</a>. All rights reserved. (Last updated: 2021-09-29)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="noopener" rel="external">jazzy ♪♫ v0.14.0</a>, a <a class="link" href="https://realm.io" target="_blank" rel="noopener" rel="external">Realm</a> project.</p>
+      <p>&copy; 2021 <a class="link" href="https://www.checkout.com/" target="_blank" rel="external noopener">Checkout.com</a>. All rights reserved. (Last updated: 2021-10-15)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="noopener" rel="external">jazzy ♪♫ v0.14.1</a>, a <a class="link" href="https://realm.io" target="_blank" rel="noopener" rel="external">Realm</a> project.</p>
     </section>
   </body>
 </div>

diff --git a/docs/Classes/CardListCellName.html b/docs/Classes/CardListCellName.html
@@ -21,7 +21,7 @@
     <header class="header">
       <p class="header-col header-col--primary">
         <a class="header-link" href="../index.html">
-          Frames 3.5.0 Docs
+          Frames 3.5.1 Docs
         </a>
          (91% documented)
       </p>
@@ -283,7 +283,7 @@ <h1>CardListCellName</h1>
                 <a name="//apple_ref/swift/Section/Properties" class="dashAnchor"></a>
                 <div class="section-name-container">
                   <a class="section-name-link" href="#/Properties"></a>
-                  <h3 class="section-name"><p>Properties</p>
+                  <h3 class="section-name"><span>Properties</span>
 </h3>
                 </div>
               </div>
@@ -326,7 +326,7 @@ <h4>Declaration</h4>
                 <a name="//apple_ref/swift/Section/Initialization" class="dashAnchor"></a>
                 <div class="section-name-container">
                   <a class="section-name-link" href="#/Initialization"></a>
-                  <h3 class="section-name"><p>Initialization</p>
+                  <h3 class="section-name"><span>Initialization</span>
 </h3>
                 </div>
               </div>
@@ -399,8 +399,8 @@ <h4>Declaration</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2021 <a class="link" href="https://www.checkout.com/" target="_blank" rel="noopener" rel="external">Checkout.com</a>. All rights reserved. (Last updated: 2021-09-29)</p>
-      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="noopener" rel="external">jazzy ♪♫ v0.14.0</a>, a <a class="link" href="https://realm.io" target="_blank" rel="noopener" rel="external">Realm</a> project.</p>
+      <p>&copy; 2021 <a class="link" href="https://www.checkout.com/" target="_blank" rel="external noopener">Checkout.com</a>. All rights reserved. (Last updated: 2021-10-15)</p>
+      <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="noopener" rel="external">jazzy ♪♫ v0.14.1</a>, a <a class="link" href="https://realm.io" target="_blank" rel="noopener" rel="external">Realm</a> project.</p>
     </section>
   </body>
 </div>