Merge Release/1.10.1 into Master

.circleci/config.yml

@@ -1,8 +1,8 @@
 version: 2.1
 
 orbs:
-  # This uses the iOS Orb located at https://github.com/wordpress-mobile/circleci-orbs
-  ios: wordpress-mobile/ios@0.0.35
+  # Using 1.0 of our Orbs means it will use the latest 1.0.x version from https://github.com/wordpress-mobile/circleci-orbs
+  ios: wordpress-mobile/ios@1.0
 
 workflows:
   test_and_validate:
@@ -14,15 +14,18 @@ workflows:
           scheme: WordPressAuthenticator
           device: iPhone 11
           ios-version: "13.0"
+          bundle-install: true
+          pod-install: true
       - ios/validate-podspec:
           name: Validate Podspec
           xcode-version: "11.0"
           podspec-path: WordPressAuthenticator.podspec
-          update-specs-repo: true
+          bundle-install: true
       - ios/publish-podspec:
           name: Publish to Trunk
           xcode-version: "11.0"
           podspec-path: WordPressAuthenticator.podspec
+          bundle-install: true
           post-to-slack: true
           filters:
             tags:

Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org' do
-  gem 'cocoapods', '~>1.7.0'
-  gem 'cocoapods-repo-update'
+  gem 'cocoapods', '~> 1.8.0'
 end

Gemfile.lock

@@ -7,18 +7,21 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    algoliasearch (1.27.1)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.0.3)
-    cocoapods (1.7.5)
+    cocoapods (1.8.3)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.7.5)
+      cocoapods-core (= 1.8.3)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.3.1, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
@@ -27,20 +30,20 @@ GEM
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.10.0, < 2.0)
-    cocoapods-core (1.7.5)
+      xcodeproj (>= 1.11.1, < 2.0)
+    cocoapods-core (1.8.3)
       activesupport (>= 4.0.2, < 6)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.4)
     cocoapods-downloader (1.2.2)
     cocoapods-plugins (1.0.0)
       nap
-    cocoapods-repo-update (0.0.4)
-      cocoapods (~> 1.0, >= 1.3.0)
     cocoapods-search (1.0.0)
     cocoapods-stats (1.1.0)
-    cocoapods-trunk (1.4.0)
+    cocoapods-trunk (1.4.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
@@ -50,9 +53,11 @@ GEM
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
+    httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
+    json (2.2.0)
+    minitest (5.12.2)
     molinillo (0.6.6)
     nanaimo (0.2.6)
     nap (1.1.0)
@@ -72,8 +77,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.7.0)!
-  cocoapods-repo-update!
+  cocoapods (~> 1.8.0)!
 
 BUNDLED WITH
-   1.17.2
+   2.0.2

Podfile

@@ -1,17 +1,16 @@
-source 'https://github.com/CocoaPods/specs.git'
+source 'https://cdn.cocoapods.org/'
 
 inhibit_all_warnings!
 use_frameworks!
 
 platform :ios, '11.0'
-plugin 'cocoapods-repo-update'
 
 def wordpress_authenticator_pods
   ## Automattic libraries
   ## ====================
   ##
   pod 'Gridicons', '~> 0.15'
-  pod 'WordPressUI', '~> 1.3'
+  pod 'WordPressUI', '~> 1.4-beta.1'
   pod 'WordPressKit', '~> 4.5.1'
   pod 'WordPressShared', '~> 1.8'
 

Podfile.lock

@@ -20,7 +20,7 @@ PODS:
     - GoogleToolboxForMac/Defines (= 2.2.1)
     - "GoogleToolboxForMac/NSString+URLArguments (= 2.2.1)"
   - "GoogleToolboxForMac/NSString+URLArguments (2.2.1)"
-  - Gridicons (0.18)
+  - Gridicons (0.19)
   - GTMSessionFetcher/Core (1.2.2)
   - lottie-ios (2.5.2)
   - NSObject-SafeExpectations (0.0.3)
@@ -51,10 +51,10 @@ PODS:
     - UIDeviceIdentifier (~> 1.1.4)
     - WordPressShared (~> 1.8.0)
     - wpxmlrpc (= 0.8.4)
-  - WordPressShared (1.8.2):
+  - WordPressShared (1.8.7):
     - CocoaLumberjack (~> 3.4)
     - FormatterKit/TimeIntervalFormatter (= 1.8.2)
-  - WordPressUI (1.3.3)
+  - WordPressUI (1.4-beta.1)
   - wpxmlrpc (0.8.4)
 
 DEPENDENCIES:
@@ -73,10 +73,10 @@ DEPENDENCIES:
   - SVProgressHUD (= 2.2.5)
   - WordPressKit (~> 4.5.1)
   - WordPressShared (~> 1.8)
-  - WordPressUI (~> 1.3)
+  - WordPressUI (~> 1.4-beta.1)
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  trunk:
     - 1PasswordExtension
     - Alamofire
     - CocoaLumberjack
@@ -107,7 +107,7 @@ SPEC CHECKSUMS:
   FormatterKit: 4b8f29acc9b872d5d12a63efb560661e8f2e1b98
   GoogleSignIn: 7ff245e1a7b26d379099d3243a562f5747e23d39
   GoogleToolboxForMac: b3553629623a3b1bff17f555e736cd5a6d95ad55
-  Gridicons: 04261236382e9c62c62c9a104f2f532c1bdf6a78
+  Gridicons: dc92efbe5fd60111d2e8ea051d84a60cca552abc
   GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23
   lottie-ios: 3fef45d3fabe63e3c7c2eb603dd64ddfffc73062
   NSObject-SafeExpectations: b989b68a8a9b7b9f2b264a8b52ba9d7aab8f3129
@@ -118,10 +118,10 @@ SPEC CHECKSUMS:
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   UIDeviceIdentifier: 8f8a24b257a4d978c8d40ad1e7355b944ffbfa8c
   WordPressKit: c35230114bbd380d63250b6d9a43337c29266c9b
-  WordPressShared: 34f7a1386d28d7e4650c1a225c554ee024401ca3
-  WordPressUI: 0ea6df25bf6e63f0619376fa23870177cb37646f
+  WordPressShared: 09cf184caa614835f5811e8609227165201e6d3e
+  WordPressUI: 35b144885c8e5817ba6874b68accc200bda61ee1
   wpxmlrpc: 6ba55c773cfa27083ae4a2173e69b19f46da98e2
 
-PODFILE CHECKSUM: 66289be542d590608e356c5ec95a46fd253a65ce
+PODFILE CHECKSUM: 831117be8f1a447aaa2277d2b421a8e64fe6f02c
 
-COCOAPODS: 1.7.5
+COCOAPODS: 1.8.3

WordPressAuthenticator.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressAuthenticator"
-  s.version       = "1.10.0"
+  s.version       = "1.10.1"
   s.summary       = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps."
 
   s.description   = <<-DESC
@@ -38,7 +38,7 @@ Pod::Spec.new do |s|
 
   s.dependency 'Gridicons', '~> 0.15'
   s.dependency 'GoogleSignIn', '~> 4.4'
-  s.dependency 'WordPressUI', '~> 1.3'
+  s.dependency 'WordPressUI', '~> 1.4-beta.1'
   s.dependency 'WordPressKit', '~> 4.5.1'
   s.dependency 'WordPressShared', '~> 1.8'
 end

WordPressAuthenticator/Authenticator/WordPressAuthenticatorStyles.swift

@@ -9,13 +9,13 @@ public struct WordPressAuthenticatorStyle {
     ///
     public let primaryNormalBackgroundColor: UIColor
 
-    public let primaryNormalBorderColor: UIColor
+    public let primaryNormalBorderColor: UIColor?
 
     /// Style: Primary + Highlighted State
     ///
     public let primaryHighlightBackgroundColor: UIColor
 
-    public let primaryHighlightBorderColor: UIColor
+    public let primaryHighlightBorderColor: UIColor?
 
     /// Style: Secondary
     ///
@@ -79,7 +79,7 @@ public struct WordPressAuthenticatorStyle {
 
     /// Designated initializer
     ///
-    public init(primaryNormalBackgroundColor: UIColor, primaryNormalBorderColor: UIColor, primaryHighlightBackgroundColor: UIColor, primaryHighlightBorderColor: UIColor, secondaryNormalBackgroundColor: UIColor, secondaryNormalBorderColor: UIColor, secondaryHighlightBackgroundColor: UIColor, secondaryHighlightBorderColor: UIColor, disabledBackgroundColor: UIColor, disabledBorderColor: UIColor, primaryTitleColor: UIColor, secondaryTitleColor: UIColor, disabledTitleColor: UIColor, textButtonColor: UIColor, textButtonHighlightColor: UIColor, instructionColor: UIColor, subheadlineColor: UIColor, placeholderColor: UIColor, viewControllerBackgroundColor: UIColor, textFieldBackgroundColor: UIColor, navBarImage: UIImage, navBarBadgeColor: UIColor, prologueBackgroundColor: UIColor = WPStyleGuide.wordPressBlue(), prologueTitleColor: UIColor = .white, statusBarStyle: UIStatusBarStyle = .lightContent) {
+    public init(primaryNormalBackgroundColor: UIColor, primaryNormalBorderColor: UIColor?, primaryHighlightBackgroundColor: UIColor, primaryHighlightBorderColor: UIColor?, secondaryNormalBackgroundColor: UIColor, secondaryNormalBorderColor: UIColor, secondaryHighlightBackgroundColor: UIColor, secondaryHighlightBorderColor: UIColor, disabledBackgroundColor: UIColor, disabledBorderColor: UIColor, primaryTitleColor: UIColor, secondaryTitleColor: UIColor, disabledTitleColor: UIColor, textButtonColor: UIColor, textButtonHighlightColor: UIColor, instructionColor: UIColor, subheadlineColor: UIColor, placeholderColor: UIColor, viewControllerBackgroundColor: UIColor, textFieldBackgroundColor: UIColor, navBarImage: UIImage, navBarBadgeColor: UIColor, prologueBackgroundColor: UIColor = WPStyleGuide.wordPressBlue(), prologueTitleColor: UIColor = .white, statusBarStyle: UIStatusBarStyle = .lightContent) {
         self.primaryNormalBackgroundColor = primaryNormalBackgroundColor
         self.primaryNormalBorderColor = primaryNormalBorderColor
         self.primaryHighlightBackgroundColor = primaryHighlightBackgroundColor