From e0877961a946463b9e97d23880e27464e16d3992 Mon Sep 17 00:00:00 2001 From: James Treanor Date: Tue, 8 Oct 2019 12:32:16 +0100 Subject: [PATCH 1/4] Update CocoaPods to 1.8.4 --- Gemfile | 2 +- Gemfile.lock | 25 ++++++++++++++++--------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 10015d925..e1b6b35ac 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ source 'https://rubygems.org' do - gem 'cocoapods', '~>1.7.0' + gem 'cocoapods', '~> 1.8.0' gem 'cocoapods-repo-update' end diff --git a/Gemfile.lock b/Gemfile.lock index 4e3a350ce..143815bd3 100644 --- a/Gemfile.lock +++ b/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,9 +30,11 @@ 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) @@ -40,7 +45,7 @@ GEM 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 +55,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 +79,8 @@ PLATFORMS ruby DEPENDENCIES - cocoapods (~> 1.7.0)! + cocoapods (~> 1.8.0)! cocoapods-repo-update! BUNDLED WITH - 1.17.2 + 2.0.2 From fdcbcc79a598df29a2a3ef35bedb0dfba6db6500 Mon Sep 17 00:00:00 2001 From: James Treanor Date: Wed, 9 Oct 2019 09:59:02 +0100 Subject: [PATCH 2/4] Update CircleCI Orb for CDN specs support --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e2945586..c7025a2ff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ 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 + ios: wordpress-mobile/ios@0.0.36 workflows: test_and_validate: @@ -18,7 +18,6 @@ workflows: name: Validate Podspec xcode-version: "11.0" podspec-path: WordPressAuthenticator.podspec - update-specs-repo: true - ios/publish-podspec: name: Publish to Trunk xcode-version: "11.0" From 9f5c67761c819663abaa9e6c107031b65e9338c3 Mon Sep 17 00:00:00 2001 From: James Treanor Date: Wed, 9 Oct 2019 10:02:23 +0100 Subject: [PATCH 3/4] Podfile: Use CDN Specs repo --- Podfile | 2 +- Podfile.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Podfile b/Podfile index f1ba44bbb..43daab646 100644 --- a/Podfile +++ b/Podfile @@ -1,4 +1,4 @@ -source 'https://github.com/cocoapods/specs.git' +source 'https://cdn.cocoapods.org/' inhibit_all_warnings! use_frameworks! diff --git a/Podfile.lock b/Podfile.lock index dce2a235f..e5436b4cd 100644 --- a/Podfile.lock +++ b/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,7 +51,7 @@ 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.4-beta.1) @@ -76,7 +76,7 @@ DEPENDENCIES: - 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 + WordPressShared: 09cf184caa614835f5811e8609227165201e6d3e WordPressUI: 35b144885c8e5817ba6874b68accc200bda61ee1 wpxmlrpc: 6ba55c773cfa27083ae4a2173e69b19f46da98e2 -PODFILE CHECKSUM: f6be249641ac6e50ae1d99aa607bab567f7aa1cb +PODFILE CHECKSUM: 40496fe99a7a1b1d46254c30ca21a1165bf109bf -COCOAPODS: 1.7.5 +COCOAPODS: 1.8.3 From cda7dcd395b44c96bc18ed78c0df619a0223d360 Mon Sep 17 00:00:00 2001 From: James Treanor Date: Wed, 9 Oct 2019 10:24:52 +0100 Subject: [PATCH 4/4] Remove cocoapods-repo-update now that we are use CDN Specs --- Gemfile | 1 - Gemfile.lock | 3 --- Podfile | 1 - Podfile.lock | 2 +- 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index e1b6b35ac..09c4d6ef1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,3 @@ source 'https://rubygems.org' do gem 'cocoapods', '~> 1.8.0' - gem 'cocoapods-repo-update' end diff --git a/Gemfile.lock b/Gemfile.lock index 143815bd3..56987e885 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,8 +41,6 @@ GEM 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.1) @@ -80,7 +78,6 @@ PLATFORMS DEPENDENCIES cocoapods (~> 1.8.0)! - cocoapods-repo-update! BUNDLED WITH 2.0.2 diff --git a/Podfile b/Podfile index 43daab646..1a3aef173 100644 --- a/Podfile +++ b/Podfile @@ -4,7 +4,6 @@ inhibit_all_warnings! use_frameworks! platform :ios, '11.0' -plugin 'cocoapods-repo-update' def wordpress_authenticator_pods ## Automattic libraries diff --git a/Podfile.lock b/Podfile.lock index e5436b4cd..65eb9b9ec 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -122,6 +122,6 @@ SPEC CHECKSUMS: WordPressUI: 35b144885c8e5817ba6874b68accc200bda61ee1 wpxmlrpc: 6ba55c773cfa27083ae4a2173e69b19f46da98e2 -PODFILE CHECKSUM: 40496fe99a7a1b1d46254c30ca21a1165bf109bf +PODFILE CHECKSUM: 831117be8f1a447aaa2277d2b421a8e64fe6f02c COCOAPODS: 1.8.3