Merge pull request #74 from wordpress-mobile/release/1.2.1

Merge Release/1.2.1 into master

Author: jtreanor

.circleci/config.yml

@@ -2,17 +2,20 @@ version: 2.1
 
 orbs:
   # This uses the iOS Orb located at https://github.com/wordpress-mobile/circleci-orbs
-  ios: wordpress-mobile/[email protected].13
+  ios: wordpress-mobile/[email protected].24
 
 workflows:
   test_and_validate:
     jobs:
       - ios/test:
           name: Test
+          xcode-version: "10.2.0"
           workspace: WordPressAuthenticator.xcworkspace
           scheme: WordPressAuthenticator
-          destination: "platform=iOS Simulator,name=iPhone XS,OS=latest"
+          device: iPhone XS
+          ios-version: "12.2"
       - ios/validate-podspec:
           name: Validate Podspec
+          xcode-version: "10.2.0"
           podspec-path: WordPressAuthenticator.podspec
           update-specs-repo: true

Gemfile

@@ -1,5 +1,4 @@
 source 'https://rubygems.org' do
-  gem 'cocoapods', '1.5.3'
+  gem 'cocoapods', '1.6.1'
   gem 'cocoapods-repo-update'
-  gem 'xcpretty'
 end

Gemfile.lock

@@ -2,54 +2,52 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (3.0.0)
-    activesupport (4.2.11)
+    activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     atomos (0.1.3)
     claide (1.0.2)
-    cocoapods (1.5.3)
+    cocoapods (1.6.1)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.5.3)
+      cocoapods-core (= 1.6.1)
       cocoapods-deintegrate (>= 1.0.2, < 2.0)
-      cocoapods-downloader (>= 1.2.0, < 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.0, < 2.0)
+      cocoapods-trunk (>= 1.3.1, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (~> 2.0.1)
+      fourflusher (>= 2.2.0, < 3.0)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.6.5)
+      molinillo (~> 0.6.6)
       nap (~> 1.0)
-      ruby-macho (~> 1.1)
-      xcodeproj (>= 1.5.7, < 2.0)
-    cocoapods-check (1.0.2)
-      cocoapods (~> 1.0)
-    cocoapods-core (1.5.3)
+      ruby-macho (~> 1.4)
+      xcodeproj (>= 1.8.1, < 2.0)
+    cocoapods-core (1.6.1)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.2)
+    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.0.0)
+    cocoapods-stats (1.1.0)
     cocoapods-trunk (1.3.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     escape (0.0.4)
-    fourflusher (2.0.1)
+    fourflusher (2.2.0)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     i18n (0.9.5)
@@ -59,28 +57,23 @@ GEM
     nanaimo (0.2.6)
     nap (1.1.0)
     netrc (0.11.0)
-    rouge (2.0.7)
-    ruby-macho (1.3.1)
+    ruby-macho (1.4.0)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xcodeproj (1.7.0)
+    xcodeproj (1.8.2)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.2.6)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (= 1.5.3)!
-  cocoapods-check!
+  cocoapods (= 1.6.1)!
   cocoapods-repo-update!
-  xcpretty!
 
 BUNDLED WITH
    1.17.2

Podfile

@@ -6,18 +6,13 @@ use_frameworks!
 platform :ios, '10.0'
 plugin 'cocoapods-repo-update'
 
-## WordPress Authenticator
-## =======================
-##
-target 'WordPressAuthenticator' do
-  project 'WordPressAuthenticator.xcodeproj'
-
+def wordpress_authenticator_pods
   ## Automattic libraries
   ## ====================
   ##
   pod 'Gridicons', '~> 0.15'
   pod 'WordPressUI', '~> 1.0'
-  pod 'WordPressKit', '~> 3.1'
+  pod 'WordPressKit', '~> 3.2.2.beta'
   pod 'WordPressShared', '~> 1.4'
 
   ## Third party libraries
@@ -26,22 +21,30 @@ target 'WordPressAuthenticator' do
   pod '1PasswordExtension', '1.8.5'
   pod 'Alamofire', '4.7.3'
   pod 'CocoaLumberjack', '3.4.2'
-  pod 'GoogleSignInRepacked', '4.1.2'
+  pod 'GoogleSignIn', '4.1.2'
   pod 'lottie-ios', '2.5.2'
   pod 'NSURL+IDN', '0.3'
   pod 'SVProgressHUD', '2.2.5'
+end
 
+## WordPress Authenticator
+## =======================
+##
+target 'WordPressAuthenticator' do
+  project 'WordPressAuthenticator.xcodeproj'
+  wordpress_authenticator_pods
+end
 
-  ## Unit Tests
-  ## ==========
-  ##
-  target 'WordPressAuthenticatorTests' do
-    inherit! :search_paths
+## Unit Tests
+## ==========
+##
+target 'WordPressAuthenticatorTests' do
+  project 'WordPressAuthenticator.xcodeproj'
+  wordpress_authenticator_pods
 
-    pod 'OHHTTPStubs', '6.1.0'
-    pod 'OHHTTPStubs/Swift', '6.1.0'
-    pod 'OCMock', '~> 3.4'
-    pod 'Expecta', '1.0.6'
-    pod 'Specta', '1.0.7'
-  end
+  pod 'OHHTTPStubs', '6.1.0'
+  pod 'OHHTTPStubs/Swift', '6.1.0'
+  pod 'OCMock', '~> 3.4'
+  pod 'Expecta', '1.0.6'
+  pod 'Specta', '1.0.7'
 end

Podfile.lock

@@ -11,9 +11,11 @@ PODS:
   - FormatterKit/Resources (1.8.2)
   - FormatterKit/TimeIntervalFormatter (1.8.2):
     - FormatterKit/Resources
-  - GoogleSignInRepacked (4.1.2):
+  - GoogleSignIn (4.1.2):
     - "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)"
     - "GoogleToolboxForMac/NSString+URLArguments (~> 2.1)"
+    - GTMOAuth2 (~> 1.0)
+    - GTMSessionFetcher/Core (~> 1.1)
   - GoogleToolboxForMac/DebugUtils (2.2.0):
     - GoogleToolboxForMac/Defines (= 2.2.0)
   - GoogleToolboxForMac/Defines (2.2.0)
@@ -23,6 +25,13 @@ PODS:
     - "GoogleToolboxForMac/NSString+URLArguments (= 2.2.0)"
   - "GoogleToolboxForMac/NSString+URLArguments (2.2.0)"
   - Gridicons (0.18)
+  - GTMOAuth2 (1.1.6):
+    - GTMSessionFetcher (~> 1.1)
+  - GTMSessionFetcher (1.2.1):
+    - GTMSessionFetcher/Full (= 1.2.1)
+  - GTMSessionFetcher/Core (1.2.1)
+  - GTMSessionFetcher/Full (1.2.1):
+    - GTMSessionFetcher/Core (= 1.2.1)
   - lottie-ios (2.5.2)
   - NSObject-SafeExpectations (0.0.3)
   - "NSURL+IDN (0.3)"
@@ -45,7 +54,7 @@ PODS:
   - Specta (1.0.7)
   - SVProgressHUD (2.2.5)
   - UIDeviceIdentifier (1.1.4)
-  - WordPressKit (3.1.1):
+  - WordPressKit (3.2.2.beta-1):
     - Alamofire (~> 4.7.3)
     - CocoaLumberjack (~> 3.4)
     - NSObject-SafeExpectations (= 0.0.3)
@@ -63,7 +72,7 @@ DEPENDENCIES:
   - Alamofire (= 4.7.3)
   - CocoaLumberjack (= 3.4.2)
   - Expecta (= 1.0.6)
-  - GoogleSignInRepacked (= 4.1.2)
+  - GoogleSignIn (= 4.1.2)
   - Gridicons (~> 0.15)
   - lottie-ios (= 2.5.2)
   - "NSURL+IDN (= 0.3)"
@@ -72,7 +81,7 @@ DEPENDENCIES:
   - OHHTTPStubs/Swift (= 6.1.0)
   - Specta (= 1.0.7)
   - SVProgressHUD (= 2.2.5)
-  - WordPressKit (~> 3.1)
+  - WordPressKit (~> 3.2.2.beta)
   - WordPressShared (~> 1.4)
   - WordPressUI (~> 1.0)
 
@@ -83,9 +92,11 @@ SPEC REPOS:
     - CocoaLumberjack
     - Expecta
     - FormatterKit
-    - GoogleSignInRepacked
+    - GoogleSignIn
     - GoogleToolboxForMac
     - Gridicons
+    - GTMOAuth2
+    - GTMSessionFetcher
     - lottie-ios
     - NSObject-SafeExpectations
     - "NSURL+IDN"
@@ -105,9 +116,11 @@ SPEC CHECKSUMS:
   CocoaLumberjack: db7cc9e464771f12054c22ff6947c5a58d43a0fd
   Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
   FormatterKit: 4b8f29acc9b872d5d12a63efb560661e8f2e1b98
-  GoogleSignInRepacked: d357702618c555f38923576924661325eb1ef22b
+  GoogleSignIn: d9ef55b10f0aa401a5de2747f59b725e4b9732ac
   GoogleToolboxForMac: ff31605b7d66400dcec09bed5861689aebadda4d
   Gridicons: 04261236382e9c62c62c9a104f2f532c1bdf6a78
+  GTMOAuth2: e8b6512c896235149df975c41d9a36c868ab7fba
+  GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca
   lottie-ios: 3fef45d3fabe63e3c7c2eb603dd64ddfffc73062
   NSObject-SafeExpectations: b989b68a8a9b7b9f2b264a8b52ba9d7aab8f3129
   "NSURL+IDN": 82355a0afd532fe1de08f6417c134b49b1a1c4b3
@@ -116,11 +129,11 @@ SPEC CHECKSUMS:
   Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   UIDeviceIdentifier: 8f8a24b257a4d978c8d40ad1e7355b944ffbfa8c
-  WordPressKit: 9af12361492d12c6c5512d3d7de594aa415ad670
+  WordPressKit: 64abfa026368c51366048ef839f8a510d7284942
   WordPressShared: 63d57a4a07ad9f9a1ee5e8a7162e48fbb5192014
   WordPressUI: 44fe43a9c5c504dfd534286e39e1ce6ebcd69ff5
   wpxmlrpc: 6ba55c773cfa27083ae4a2173e69b19f46da98e2
 
-PODFILE CHECKSUM: 220853b585b7b73f8958c30e6f9c1c5760d4c7a3
+PODFILE CHECKSUM: 6e6ee68c087322b45df83a787321f0a10ddb52b3
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.6.1

WordPressAuthenticator.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressAuthenticator"
-  s.version       = "1.2.0"
+  s.version       = "1.2.1"
   s.summary       = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps."
 
   s.description   = <<-DESC
@@ -18,8 +18,15 @@ Pod::Spec.new do |s|
   s.source        = { :git => "https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git", :tag => s.version.to_s }
   s.source_files  = 'WordPressAuthenticator/**/*.{h,m,swift}'
   s.private_header_files = "WordPressAuthenticator/Private/*.h"
-  s.resources     = [ 'WordPressAuthenticator/**/*.{xcassets,storyboard,xib,json}' ]
+  s.resource_bundles = {
+    'WordPressAuthenticator': [
+      'WordPressAuthenticator/Resources/Assets.xcassets',
+      'WordPressAuthenticator/Resources/Animations/*.json',
+      'WordPressAuthenticator/**/*.{storyboard,xib}'
+    ]
+  }
   s.requires_arc  = true
+  s.static_framework = true # This is needed because GoogleSignIn vendors a static framework
   s.header_dir    = 'WordPressAuthenticator'
 
   s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO' }
@@ -32,8 +39,8 @@ Pod::Spec.new do |s|
   s.dependency 'SVProgressHUD', '2.2.5'
 
   s.dependency 'Gridicons', '~> 0.15'
-  s.dependency 'GoogleSignInRepacked', '4.1.2'
+  s.dependency 'GoogleSignIn', '4.1.2'
   s.dependency 'WordPressUI', '~> 1.0'
-  s.dependency 'WordPressKit', '~> 3.1'
+  s.dependency 'WordPressKit', '~> 3.2.2'
   s.dependency 'WordPressShared', '~> 1.4'
 end