Merge release/1.36.0 to trunk

.circleci/config.yml

@@ -2,14 +2,24 @@ version: 2.1
 
 orbs:
   # 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 
+  ios: wordpress-mobile/ios@1.0
+
+# YAML anchors for some common/repeated values
+x-common-params:
+  - &xcode-version "12.2.0"
+  - &podspec "WordPressAuthenticator.podspec"
+  - &on-tags-only
+      tags:
+        only: /.*/
+      branches:
+        ignore: /.*/
 
 workflows:
   test_and_validate:
     jobs:
       - ios/test:
           name: Test
-          xcode-version: "12.2.0"
+          xcode-version: *xcode-version
           workspace: WordPressAuthenticator.xcworkspace
           scheme: WordPressAuthenticator
           device: iPhone 11
@@ -18,17 +28,21 @@ workflows:
           pod-install: true
       - ios/validate-podspec:
           name: Validate Podspec
-          xcode-version: "12.2.0"
-          podspec-path: WordPressAuthenticator.podspec
+          xcode-version: *xcode-version
+          podspec-path: *podspec
+          bundle-install: true
+      - ios/publish-podspec:
+          name: Publish to a8c Spec Repo
+          xcode-version: *xcode-version
+          podspec-path: *podspec
+          spec-repo: https://github.com/wordpress-mobile/cocoapods-specs.git
           bundle-install: true
+          post-to-slack: false
+          filters: *on-tags-only
       - ios/publish-podspec:
           name: Publish to Trunk
-          xcode-version: "12.2.0"
-          podspec-path: WordPressAuthenticator.podspec
+          xcode-version: *xcode-version
+          podspec-path: *podspec
           bundle-install: true
           post-to-slack: true
-          filters:
-            tags:
-              only: /.*/
-            branches:
-              ignore: /.*/
+          filters: *on-tags-only

WordPressAuthenticator.podspec

@@ -1,20 +1,22 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressAuthenticator"
-  s.version       = "1.35.1"
-  s.summary       = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps."
+  s.version       = "1.36.0"
 
+  s.summary       = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps."
   s.description   = <<-DESC
                     This framework encapsulates everything required to display the Authentication UI
                     and perform authentication against WordPress.com and WordPress.org sites.
 
-                    Plus: WordPress.com *signup*  is supported.
-                    DESC
+                    Plus: WordPress.com *signup* is supported.
+                  DESC
 
   s.homepage      = "https://github.com/wordpress-mobile/WordPressAuthenticator-iOS"
-  s.license       = "GPLv2"
-  s.author        = { "WordPress" => "mobile@automattic.com" }
+  s.license       = { :type => "GPLv2", :file => "LICENSE" }
+  s.author        = { "The WordPress Mobile Team" => "mobile@wordpress.org" }
+
   s.platform      = :ios, "11.0"
   s.swift_version = '4.2'
+
   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"
@@ -26,17 +28,19 @@ Pod::Spec.new do |s|
       'WordPressAuthenticator/**/*.{storyboard,xib}'
     ]
   }
-  s.requires_arc  = true
   s.static_framework = true # This is needed because GoogleSignIn vendors a static framework
   s.header_dir    = 'WordPressAuthenticator'
 
+  # Fixing arm64 issue with Xcode 12: https://github.com/CocoaPods/CocoaPods/issues/10104
+  s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
+  s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }  
+
   s.dependency '1PasswordExtension', '~> 1.8.6'
   s.dependency 'Alamofire', '~> 4.8'
   s.dependency 'CocoaLumberjack', '~> 3.5'
   s.dependency 'lottie-ios', '~> 3.1.6'
   s.dependency 'NSURL+IDN', '0.4'
   s.dependency 'SVProgressHUD', '~> 2.2.5'
-
   s.dependency 'Gridicons', '~> 1.0'
   s.dependency 'GoogleSignIn', '~> 5.0.2'
 
@@ -45,9 +49,4 @@ Pod::Spec.new do |s|
   s.dependency 'WordPressUI', '~> 1.7-beta'
   s.dependency 'WordPressKit', '~> 4.18-beta' # Don't change this until we hit 5.0 in WPKit
   s.dependency 'WordPressShared', '~> 1.12-beta' # Don't change this until we hit 2.0 in WPShared
-
-  # Fixing arm64 issue with Xcode 12: https://github.com/CocoaPods/CocoaPods/issues/10104
-  s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
-  s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
-
 end