Swift conversion review: Update project files, scripts, and embedded dependencies (#1695)

.circleci/config.yml

@@ -1,9 +1,12 @@
+# For a detailed guide to building and testing on iOS, read the docs:
+# https://circleci.com/docs/2.0/testing-ios/
+
 version: 2.1
 
 jobs:
   standard-tests:
     macos:
-      xcode: 11.7.0 # Specify the Xcode version to use
+      xcode: 12.0.0 # Specify the Xcode version to use
 
     steps:
       - checkout
@@ -12,7 +15,7 @@ jobs:
 
   integration-tests:
     macos:
-      xcode: 11.7.0 # Specify the Xcode version to use
+      xcode: 12.0.0 # Specify the Xcode version to use
 
     steps:
       - checkout
@@ -21,7 +24,7 @@ jobs:
 
   ui-and-analyze-tests:
     macos:
-      xcode: 11.7.0 # Specify the Xcode version to use
+      xcode: 12.0.0 # Specify the Xcode version to use
 
     steps:
       - checkout
@@ -30,7 +33,7 @@ jobs:
     
   linting-tests:
     macos:
-      xcode: 11.7.0 # Specify the Xcode version to use
+      xcode: 12.0.0 # Specify the Xcode version to use
 
     steps:
       - checkout
@@ -40,7 +43,7 @@ jobs:
 
   test-legacy-11:
     macos:
-      xcode: 11.7.0 # Specify the Xcode version to use
+      xcode: 12.0.0 # Specify the Xcode version to use
 
     steps:
       - checkout
@@ -51,7 +54,7 @@ jobs:
 
   test-legacy-12:
     macos:
-      xcode: 11.7.0 # Specify the Xcode version to use
+      xcode: 12.0.0 # Specify the Xcode version to use
 
     steps:
       - checkout

.jazzy.yaml

@@ -2,8 +2,6 @@
 
 output: docs/docs
 clean: true
-objc: true
-umbrella_header: Stripe/PublicHeaders/Stripe/Stripe.h
 framework_root: Stripe
 sdk: iphonesimulator
 author: Stripe
@@ -14,9 +12,3 @@ github_file_prefix: https://github.com/stripe/stripe-ios/tree/master
 skip_undocumented: true
 hide_documentation_coverage: true
 theme: fullwidth
-exclude: 
-  - Stripe/PublicHeaders/Stripe/STD*
-  - Stripe/PublicHeaders/Stripe/Stripe3DS2.h
-  - InternalFrameworks/dynamic/Stripe3DS2.xcframework/**
-  - build*
-  - .git

.swift-format

@@ -0,0 +1,54 @@
+{
+  "fileScopedDeclarationPrivacy" : {
+    "accessLevel" : "private"
+  },
+  "indentation" : {
+    "spaces" : 2
+  },
+  "indentConditionalCompilationBlocks" : true,
+  "indentSwitchCaseLabels" : false,
+  "lineBreakAroundMultilineExpressionChainComponents" : false,
+  "lineBreakBeforeControlFlowKeywords" : false,
+  "lineBreakBeforeEachArgument" : false,
+  "lineBreakBeforeEachGenericRequirement" : false,
+  "lineLength" : 100,
+  "maximumBlankLines" : 1,
+  "prioritizeKeepingFunctionOutputTogether" : false,
+  "respectsExistingLineBreaks" : true,
+  "rules" : {
+    "AllPublicDeclarationsHaveDocumentation" : false,
+    "AlwaysUseLowerCamelCase" : true,
+    "AmbiguousTrailingClosureOverload" : true,
+    "BeginDocumentationCommentWithOneLineSummary" : true,
+    "DoNotUseSemicolons" : true,
+    "DontRepeatTypeInStaticProperties" : true,
+    "FileScopedDeclarationPrivacy" : true,
+    "FullyIndirectEnum" : true,
+    "GroupNumericLiterals" : true,
+    "IdentifiersMustBeASCII" : true,
+    "NeverForceUnwrap" : false,
+    "NeverUseForceTry" : false,
+    "NeverUseImplicitlyUnwrappedOptionals" : false,
+    "NoAccessLevelOnExtensionDeclaration" : true,
+    "NoBlockComments" : true,
+    "NoCasesWithOnlyFallthrough" : true,
+    "NoEmptyTrailingClosureParentheses" : true,
+    "NoLabelsInCasePatterns" : true,
+    "NoLeadingUnderscores" : false,
+    "NoParensAroundConditions" : true,
+    "NoVoidReturnOnFunctionSignature" : true,
+    "OneCasePerLine" : true,
+    "OneVariableDeclarationPerLine" : true,
+    "OnlyOneTrailingClosureArgument" : true,
+    "OrderedImports" : true,
+    "ReturnVoidInsteadOfEmptyTuple" : true,
+    "UseLetInEveryBoundCaseVariable" : true,
+    "UseShorthandTypeNames" : true,
+    "UseSingleLinePropertyGetter" : true,
+    "UseSynthesizedInitializer" : true,
+    "UseTripleSlashForDocumentationComments" : true,
+    "ValidateDocumentationComments" : false
+  },
+  "tabWidth" : 8,
+  "version" : 1
+}

.swiftlint.yml

@@ -0,0 +1,68 @@
+# .swiftlint.yml
+#
+# Useful rules reference: https://realm.github.io/SwiftLint/rule-directory.html
+
+disabled_rules:
+  - line_length
+  - type_body_length
+
+opt_in_rules:
+  - attributes
+  - closing_brace
+  - colon
+  - comma
+  - control_statement
+  - empty_count
+  - file_header
+  - force_try
+  - joined_default_parameter
+  - leading_whitespace
+  - legacy_cggeometry_functions
+  - legacy_constant
+  - multiline_parameters
+  - nesting
+  - opening_brace
+  - overridden_super_call
+  - private_outlet
+  - prohibited_super_call
+  - redundant_nil_coalescing
+  - return_arrow_whitespace
+  - single_test_class
+  - statement_position
+  - trailing_newline
+  - trailing_semicolon
+  - trailing_whitespace
+
+excluded:
+  - Pods
+  - Carthage
+  - Tests/installation_tests
+
+file_header:
+  required_pattern: |
+                    \/\/
+                    \/\/  .*?\.swift
+                    \/\/  (Stripe|StripeTests|StripeiOS)
+                    \/\/
+                    \/\/(  Created by .*? on \d{1,2}\/\d{1,2}\/\d{2}\.
+                    \/\/)?(  Copyright (©|\(c\)) \d{4} Stripe\. All rights reserved\.
+                    \/\/)?
+
+function_parameter_count:
+  warning: 4  # Progressively lower this number from the default of 5
+
+identifier_name:
+  allowed_symbols: _
+  min_length: 1
+  validates_start_with_lowercase: false
+
+large_tuple:
+  warning: 4                # It would be nice to lower this number
+  error: 5
+
+type_name:
+  allowed_symbols: _
+
+vertical_whitespace:
+  max_empty_lines: 2
+

Basic Integration.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "container:Example/Basic Integration.xcodeproj">
+   </FileRef>
+</Workspace>

Basic Integration.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 21.0.0 2020-XX-XX
+* Converted the SDK to Swift. Migration instructions are available at [https://stripe.com/docs/mobile/ios/sdk-21-migration](https://stripe.com/docs/mobile/ios/sdk-21-migration).
+
 ## 20.1.1 2020-10-23
 * Fixes an issue when using Cocoapods 1.10 and Xcode 12. [#1683](https://github.com/stripe/stripe-ios/pull/1683)
 * Fixes a warning when using Swift Package Manager. [#1675](https://github.com/stripe/stripe-ios/pull/1675)

Cartfile.private

@@ -1,4 +1,4 @@
-github "uber/ios-snapshot-test-case"
+github "davidme-stripe/ios-snapshot-test-case" "master"
 github "erikdoe/ocmock"
 github "AliSoftware/OHHTTPStubs" >= 8.0.0
 github "capitalone/SWHttpTrafficRecorder"

Cartfile.resolved

@@ -1,4 +1,4 @@
-github "AliSoftware/OHHTTPStubs" "8.0.0"
+github "AliSoftware/OHHTTPStubs" "9.0.0"
 github "capitalone/SWHttpTrafficRecorder" "1.0.2"
+github "davidme-stripe/ios-snapshot-test-case" "a2b58e64715c23e443bdb3812b5ccfd86eaa4ac8"
 github "erikdoe/ocmock" "v3.7.1"
-github "uber/ios-snapshot-test-case" "6.1.0"

Gemfile.lock

@@ -14,7 +14,7 @@ GEM
       json (>= 1.5.1)
     atomos (0.1.3)
     aws-eventstream (1.1.0)
-    aws-partitions (1.385.0)
+    aws-partitions (1.381.0)
     aws-sdk-core (3.109.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
@@ -23,7 +23,7 @@ GEM
     aws-sdk-kms (1.39.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.83.1)
+    aws-sdk-s3 (1.83.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -31,10 +31,10 @@ GEM
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.0.3)
-    cocoapods (1.10.0)
+    cocoapods (1.10.0.rc.1)
       addressable (~> 2.6)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.10.0)
+      cocoapods-core (= 1.10.0.rc.1)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.4.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -48,8 +48,8 @@ GEM
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.19.0, < 2.0)
+      xcodeproj (>= 1.17.0, < 2.0)
-    cocoapods-core (1.10.0)
+    cocoapods-core (1.10.0.rc.1)
       activesupport (> 5.0, < 6)
       addressable (~> 2.6)
       algoliasearch (~> 1.0)
@@ -84,17 +84,16 @@ GEM
     escape (0.0.4)
     ethon (0.12.0)
       ffi (>= 1.3.0)
-    excon (0.78.0)
+    excon (0.76.0)
-    faraday (1.1.0)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
     fastimage (2.2.0)
-    fastlane (2.164.0)
+    fastlane (2.163.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       aws-sdk-s3 (~> 1.0)
@@ -193,7 +192,6 @@ GEM
     retriable (3.1.2)
     rouge (2.0.7)
     ruby-macho (1.4.0)
-    ruby2_keywords (0.0.2)
     rubyzip (2.3.0)
     security (0.1.3)
     signet (0.14.0)
@@ -238,7 +236,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods
+  cocoapods (= 1.10.0.rc.1)
   fastlane
 
 BUNDLED WITH

InternalFrameworks/Stripe3DS2.xcframework/Info.plist

@@ -4,20 +4,6 @@
 <dict>
 	<key>AvailableLibraries</key>
 	<array>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<string>ios-x86_64-maccatalyst</string>
-			<key>LibraryPath</key>
-			<string>Stripe3DS2.framework</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>x86_64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>maccatalyst</string>
-		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
 			<string>ios-arm64_x86_64-simulator</string>
@@ -33,6 +19,20 @@
 			<key>SupportedPlatformVariant</key>
 			<string>simulator</string>
 		</dict>
+		<dict>
+			<key>LibraryIdentifier</key>
+			<string>ios-x86_64-maccatalyst</string>
+			<key>LibraryPath</key>
+			<string>Stripe3DS2.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>maccatalyst</string>
+		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
 			<string>ios-arm64</string>