From 3ce8b87d7b6ecbc61341c1c7fa235fe71fec1154 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Mon, 9 Mar 2020 15:13:12 -0500 Subject: [PATCH 01/76] Update pod file to point to wordpresskit-ios branch --- Podfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Podfile b/Podfile index e77e57816..84580999b 100644 --- a/Podfile +++ b/Podfile @@ -11,8 +11,8 @@ def wordpress_authenticator_pods ## pod 'Gridicons', '~> 0.15' pod 'WordPressUI', '~> 1.4-beta.1' - pod 'WordPressKit', '~> 4.5.9-beta' - # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'issue/apple_2fa_auth' + # pod 'WordPressKit', '~> 4.5.9-beta' + pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'issue/224-update-wpxmlrpc-pod' pod 'WordPressShared', '~> 1.8.13' ## Third party libraries From 3fe86b107bc3e49e2eb57af71c305385be4aca72 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Mon, 9 Mar 2020 15:13:40 -0500 Subject: [PATCH 02/76] Update podfile.lock to use new branch and version of wpkit (4.6.0-beta.1) --- Podfile.lock | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 39d448c38..01cd034d3 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -44,7 +44,7 @@ PODS: - Specta (1.0.7) - SVProgressHUD (2.2.5) - UIDeviceIdentifier (1.4.0) - - WordPressKit (4.5.9-beta.2): + - WordPressKit (4.6.0-beta.1): - Alamofire (~> 4.8.0) - CocoaLumberjack (~> 3.4) - NSObject-SafeExpectations (= 0.0.3) @@ -71,7 +71,7 @@ DEPENDENCIES: - OHHTTPStubs/Swift (= 8.0.0) - Specta (= 1.0.7) - SVProgressHUD (= 2.2.5) - - WordPressKit (~> 4.5.9-beta) + - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, branch `issue/224-update-wpxmlrpc-pod`) - WordPressShared (~> 1.8.13) - WordPressUI (~> 1.4-beta.1) @@ -94,11 +94,20 @@ SPEC REPOS: - Specta - SVProgressHUD - UIDeviceIdentifier - - WordPressKit - WordPressShared - WordPressUI - wpxmlrpc +EXTERNAL SOURCES: + WordPressKit: + :branch: issue/224-update-wpxmlrpc-pod + :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git + +CHECKOUT OPTIONS: + WordPressKit: + :commit: 68fae371296313406e294a60e6e2f8cda7c7522e + :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git + SPEC CHECKSUMS: 1PasswordExtension: 0e95bdea64ec8ff2f4f693be5467a09fac42a83d Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844 @@ -117,11 +126,11 @@ SPEC CHECKSUMS: Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66 SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6 UIDeviceIdentifier: 44f805037d21b94394821828f4fcaba34b38c2d0 - WordPressKit: 54b1c041c59b871e91a331f24a2fb5d347e070b0 + WordPressKit: cec4dfcb3fb5aa04c08fd84b16452ab919474a20 WordPressShared: fde9523bd00696fc1dfa45ed5299e16de111ebcc WordPressUI: 35b144885c8e5817ba6874b68accc200bda61ee1 wpxmlrpc: 6ba55c773cfa27083ae4a2173e69b19f46da98e2 -PODFILE CHECKSUM: c8429d9d1b129c0d3f037b246b2a63567bf0f654 +PODFILE CHECKSUM: c688709d675b8517105d2e15f808b9c90aa350f3 COCOAPODS: 1.8.4 From 2976ebb12e3379dbc014cacdd6dca525dc859b9c Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Mon, 9 Mar 2020 15:14:10 -0500 Subject: [PATCH 03/76] Update podspec dependency (wpkit) and version number (1.11.0-beta.1) --- WordPressAuthenticator.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index 6db6ce552..5d6b2e1ed 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressAuthenticator" - s.version = "1.10.9" + s.version = "1.11.0-beta.1" s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps." s.description = <<-DESC @@ -40,6 +40,6 @@ Pod::Spec.new do |s| s.dependency 'Gridicons', '~> 0.15' s.dependency 'GoogleSignIn', '~> 4.4' s.dependency 'WordPressUI', '~> 1.4-beta.1' - s.dependency 'WordPressKit', '~> 4.5.9-beta' + s.dependency 'WordPressKit', '~> 4.6.0-beta.1' s.dependency 'WordPressShared', '~> 1.8.13-beta' end From 92f3b6b83234171be12c421060ace32cdb739687 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Mon, 9 Mar 2020 15:29:23 -0500 Subject: [PATCH 04/76] Revert podspec dependency until wpkit 4.6.0-beta.1 is published --- WordPressAuthenticator.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index 5d6b2e1ed..c5659d192 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -40,6 +40,6 @@ Pod::Spec.new do |s| s.dependency 'Gridicons', '~> 0.15' s.dependency 'GoogleSignIn', '~> 4.4' s.dependency 'WordPressUI', '~> 1.4-beta.1' - s.dependency 'WordPressKit', '~> 4.6.0-beta.1' + s.dependency 'WordPressKit', '~> 4.5.9-beta' s.dependency 'WordPressShared', '~> 1.8.13-beta' end From 5c9e4bde14c1eba509ac1e7e71bf2a9b2adbd3d9 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Mon, 9 Mar 2020 16:12:34 -0500 Subject: [PATCH 05/76] Update podspec dependency declaration to wpkit 4.6.0-beta.1 --- WordPressAuthenticator.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index c5659d192..5d6b2e1ed 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -40,6 +40,6 @@ Pod::Spec.new do |s| s.dependency 'Gridicons', '~> 0.15' s.dependency 'GoogleSignIn', '~> 4.4' s.dependency 'WordPressUI', '~> 1.4-beta.1' - s.dependency 'WordPressKit', '~> 4.5.9-beta' + s.dependency 'WordPressKit', '~> 4.6.0-beta.1' s.dependency 'WordPressShared', '~> 1.8.13-beta' end From 2826e6cb70b867befd7db0d6aec0645478877241 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Tue, 10 Mar 2020 10:14:49 -0500 Subject: [PATCH 06/76] Update podfile to point to published beta version of WordPressKit pod --- Podfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Podfile b/Podfile index 84580999b..d58026c2e 100644 --- a/Podfile +++ b/Podfile @@ -11,8 +11,8 @@ def wordpress_authenticator_pods ## pod 'Gridicons', '~> 0.15' pod 'WordPressUI', '~> 1.4-beta.1' - # pod 'WordPressKit', '~> 4.5.9-beta' - pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'issue/224-update-wpxmlrpc-pod' + pod 'WordPressKit', '~> 4.6.0-beta.1' + #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'issue/224-update-wpxmlrpc-pod' pod 'WordPressShared', '~> 1.8.13' ## Third party libraries From 99b97221337ae252be820096d5342d4816944f03 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Tue, 10 Mar 2020 10:26:30 -0500 Subject: [PATCH 07/76] Update podfile.lock checksums --- Podfile.lock | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 01cd034d3..2f42f8d51 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -50,12 +50,12 @@ PODS: - NSObject-SafeExpectations (= 0.0.3) - UIDeviceIdentifier (~> 1) - WordPressShared (~> 1.8.13-beta) - - wpxmlrpc (= 0.8.4) + - wpxmlrpc (= 0.8.5-beta.1) - WordPressShared (1.8.13): - CocoaLumberjack (~> 3.4) - FormatterKit/TimeIntervalFormatter (= 1.8.2) - WordPressUI (1.4-beta.1) - - wpxmlrpc (0.8.4) + - wpxmlrpc (0.8.5-beta.1) DEPENDENCIES: - 1PasswordExtension (= 1.8.5) @@ -71,7 +71,7 @@ DEPENDENCIES: - OHHTTPStubs/Swift (= 8.0.0) - Specta (= 1.0.7) - SVProgressHUD (= 2.2.5) - - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, branch `issue/224-update-wpxmlrpc-pod`) + - WordPressKit (~> 4.6.0-beta.1) - WordPressShared (~> 1.8.13) - WordPressUI (~> 1.4-beta.1) @@ -94,20 +94,11 @@ SPEC REPOS: - Specta - SVProgressHUD - UIDeviceIdentifier + - WordPressKit - WordPressShared - WordPressUI - wpxmlrpc -EXTERNAL SOURCES: - WordPressKit: - :branch: issue/224-update-wpxmlrpc-pod - :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git - -CHECKOUT OPTIONS: - WordPressKit: - :commit: 68fae371296313406e294a60e6e2f8cda7c7522e - :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git - SPEC CHECKSUMS: 1PasswordExtension: 0e95bdea64ec8ff2f4f693be5467a09fac42a83d Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844 @@ -126,11 +117,11 @@ SPEC CHECKSUMS: Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66 SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6 UIDeviceIdentifier: 44f805037d21b94394821828f4fcaba34b38c2d0 - WordPressKit: cec4dfcb3fb5aa04c08fd84b16452ab919474a20 + WordPressKit: 769dca02698a7097b1dc2bf0d7c2aeb9c3cf38f8 WordPressShared: fde9523bd00696fc1dfa45ed5299e16de111ebcc WordPressUI: 35b144885c8e5817ba6874b68accc200bda61ee1 - wpxmlrpc: 6ba55c773cfa27083ae4a2173e69b19f46da98e2 + wpxmlrpc: d758b6ad17723d31d06493acc932f6d9b340de95 -PODFILE CHECKSUM: c688709d675b8517105d2e15f808b9c90aa350f3 +PODFILE CHECKSUM: 731846f35dc585c867ce1af029d78c4bfb3bbf5f COCOAPODS: 1.8.4 From 6da66b644594d0ca2e3d1748f3cc89c187be2315 Mon Sep 17 00:00:00 2001 From: Giorgio Ruscigno Date: Tue, 10 Mar 2020 16:35:06 -0500 Subject: [PATCH 08/76] Update to version 1.11.0-beta.2 - Update Gridicons to version 0.20.beta.1 --- Podfile | 2 +- Podfile.lock | 42 +++++++++++++++++----------------- WordPressAuthenticator.podspec | 4 ++-- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Podfile b/Podfile index d58026c2e..26296561f 100644 --- a/Podfile +++ b/Podfile @@ -9,7 +9,7 @@ def wordpress_authenticator_pods ## Automattic libraries ## ==================== ## - pod 'Gridicons', '~> 0.15' + pod 'Gridicons', '~> 0.20-beta.1' pod 'WordPressUI', '~> 1.4-beta.1' pod 'WordPressKit', '~> 4.6.0-beta.1' #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'issue/224-update-wpxmlrpc-pod' diff --git a/Podfile.lock b/Podfile.lock index 2f42f8d51..363d069c8 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -12,20 +12,20 @@ PODS: - "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)" - "GoogleToolboxForMac/NSString+URLArguments (~> 2.1)" - GTMSessionFetcher/Core (~> 1.1) - - GoogleToolboxForMac/DebugUtils (2.2.1): - - GoogleToolboxForMac/Defines (= 2.2.1) - - GoogleToolboxForMac/Defines (2.2.1) - - "GoogleToolboxForMac/NSDictionary+URLArguments (2.2.1)": - - GoogleToolboxForMac/DebugUtils (= 2.2.1) - - GoogleToolboxForMac/Defines (= 2.2.1) - - "GoogleToolboxForMac/NSString+URLArguments (= 2.2.1)" - - "GoogleToolboxForMac/NSString+URLArguments (2.2.1)" - - Gridicons (0.19) - - GTMSessionFetcher/Core (1.2.2) + - GoogleToolboxForMac/DebugUtils (2.2.2): + - GoogleToolboxForMac/Defines (= 2.2.2) + - GoogleToolboxForMac/Defines (2.2.2) + - "GoogleToolboxForMac/NSDictionary+URLArguments (2.2.2)": + - GoogleToolboxForMac/DebugUtils (= 2.2.2) + - GoogleToolboxForMac/Defines (= 2.2.2) + - "GoogleToolboxForMac/NSString+URLArguments (= 2.2.2)" + - "GoogleToolboxForMac/NSString+URLArguments (2.2.2)" + - Gridicons (0.20-beta.1) + - GTMSessionFetcher/Core (1.3.1) - lottie-ios (2.5.2) - NSObject-SafeExpectations (0.0.3) - "NSURL+IDN (0.3)" - - OCMock (3.4.3) + - OCMock (3.6) - OHHTTPStubs (8.0.0): - OHHTTPStubs/Default (= 8.0.0) - OHHTTPStubs/Core (8.0.0) @@ -51,10 +51,10 @@ PODS: - UIDeviceIdentifier (~> 1) - WordPressShared (~> 1.8.13-beta) - wpxmlrpc (= 0.8.5-beta.1) - - WordPressShared (1.8.13): + - WordPressShared (1.8.15): - CocoaLumberjack (~> 3.4) - FormatterKit/TimeIntervalFormatter (= 1.8.2) - - WordPressUI (1.4-beta.1) + - WordPressUI (1.5.1) - wpxmlrpc (0.8.5-beta.1) DEPENDENCIES: @@ -63,7 +63,7 @@ DEPENDENCIES: - CocoaLumberjack (= 3.5.2) - Expecta (= 1.0.6) - GoogleSignIn (= 4.4.0) - - Gridicons (~> 0.15) + - Gridicons (~> 0.20-beta.1) - lottie-ios (= 2.5.2) - "NSURL+IDN (= 0.3)" - OCMock (~> 3.4) @@ -106,22 +106,22 @@ SPEC CHECKSUMS: Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5 FormatterKit: 4b8f29acc9b872d5d12a63efb560661e8f2e1b98 GoogleSignIn: 7ff245e1a7b26d379099d3243a562f5747e23d39 - GoogleToolboxForMac: b3553629623a3b1bff17f555e736cd5a6d95ad55 - Gridicons: dc92efbe5fd60111d2e8ea051d84a60cca552abc - GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23 + GoogleToolboxForMac: 800648f8b3127618c1b59c7f97684427630c5ea3 + Gridicons: a89c04840b560895223a2c5c1e1299b518e0fc6f + GTMSessionFetcher: cea130bbfe5a7edc8d06d3f0d17288c32ffe9925 lottie-ios: 3fef45d3fabe63e3c7c2eb603dd64ddfffc73062 NSObject-SafeExpectations: b989b68a8a9b7b9f2b264a8b52ba9d7aab8f3129 "NSURL+IDN": 82355a0afd532fe1de08f6417c134b49b1a1c4b3 - OCMock: 43565190abc78977ad44a61c0d20d7f0784d35ab + OCMock: 5ea90566be239f179ba766fd9fbae5885040b992 OHHTTPStubs: 9cbce6364bec557cc3439aa6bb7514670d780881 Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66 SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6 UIDeviceIdentifier: 44f805037d21b94394821828f4fcaba34b38c2d0 WordPressKit: 769dca02698a7097b1dc2bf0d7c2aeb9c3cf38f8 - WordPressShared: fde9523bd00696fc1dfa45ed5299e16de111ebcc - WordPressUI: 35b144885c8e5817ba6874b68accc200bda61ee1 + WordPressShared: 02e0947034648cbd7251ffcc10f64d512f93a53b + WordPressUI: ce0ac522146dabcd0a68ace24c0104dfdf6f4b0d wpxmlrpc: d758b6ad17723d31d06493acc932f6d9b340de95 -PODFILE CHECKSUM: 731846f35dc585c867ce1af029d78c4bfb3bbf5f +PODFILE CHECKSUM: a310a5626baba3f99fbbc4d64950f53f7ae7df18 COCOAPODS: 1.8.4 diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index 5d6b2e1ed..63408af51 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressAuthenticator" - s.version = "1.11.0-beta.1" + s.version = "1.11.0-beta.2" s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps." s.description = <<-DESC @@ -37,7 +37,7 @@ Pod::Spec.new do |s| s.dependency 'NSURL+IDN', '0.3' s.dependency 'SVProgressHUD', '2.2.5' - s.dependency 'Gridicons', '~> 0.15' + s.dependency 'Gridicons', '~> 0.20-beta.1' s.dependency 'GoogleSignIn', '~> 4.4' s.dependency 'WordPressUI', '~> 1.4-beta.1' s.dependency 'WordPressKit', '~> 4.6.0-beta.1' From b24e5deef06cf39058e44a72077e3e4b8b83736c Mon Sep 17 00:00:00 2001 From: Diego Rey Mendez Date: Tue, 10 Mar 2020 19:19:23 -0300 Subject: [PATCH 09/76] Increases the WordPressKit version and this pod's version. --- Podfile | 2 +- WordPressAuthenticator.podspec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Podfile b/Podfile index d58026c2e..714a936d8 100644 --- a/Podfile +++ b/Podfile @@ -11,7 +11,7 @@ def wordpress_authenticator_pods ## pod 'Gridicons', '~> 0.15' pod 'WordPressUI', '~> 1.4-beta.1' - pod 'WordPressKit', '~> 4.6.0-beta.1' + pod 'WordPressKit', '~> 4.6.0-beta.2' #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'issue/224-update-wpxmlrpc-pod' pod 'WordPressShared', '~> 1.8.13' diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index 5d6b2e1ed..b71214376 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressAuthenticator" - s.version = "1.11.0-beta.1" + s.version = "1.11.0-beta.2" s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps." s.description = <<-DESC @@ -40,6 +40,6 @@ Pod::Spec.new do |s| s.dependency 'Gridicons', '~> 0.15' s.dependency 'GoogleSignIn', '~> 4.4' s.dependency 'WordPressUI', '~> 1.4-beta.1' - s.dependency 'WordPressKit', '~> 4.6.0-beta.1' + s.dependency 'WordPressKit', '~> 4.6.0-beta.2' s.dependency 'WordPressShared', '~> 1.8.13-beta' end From fee7b5bf70bb514a9d81b86471e7e951f01f1e84 Mon Sep 17 00:00:00 2001 From: Diego Rey Mendez Date: Tue, 10 Mar 2020 19:26:58 -0300 Subject: [PATCH 10/76] Updates the Podfile.lock. --- Podfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 2f42f8d51..588c2d0db 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -44,7 +44,7 @@ PODS: - Specta (1.0.7) - SVProgressHUD (2.2.5) - UIDeviceIdentifier (1.4.0) - - WordPressKit (4.6.0-beta.1): + - WordPressKit (4.6.0-beta.2): - Alamofire (~> 4.8.0) - CocoaLumberjack (~> 3.4) - NSObject-SafeExpectations (= 0.0.3) @@ -71,7 +71,7 @@ DEPENDENCIES: - OHHTTPStubs/Swift (= 8.0.0) - Specta (= 1.0.7) - SVProgressHUD (= 2.2.5) - - WordPressKit (~> 4.6.0-beta.1) + - WordPressKit (~> 4.6.0-beta.2) - WordPressShared (~> 1.8.13) - WordPressUI (~> 1.4-beta.1) @@ -117,11 +117,11 @@ SPEC CHECKSUMS: Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66 SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6 UIDeviceIdentifier: 44f805037d21b94394821828f4fcaba34b38c2d0 - WordPressKit: 769dca02698a7097b1dc2bf0d7c2aeb9c3cf38f8 + WordPressKit: 36f3dd07e27cee3153ea0d77b9802bc4fec48c19 WordPressShared: fde9523bd00696fc1dfa45ed5299e16de111ebcc WordPressUI: 35b144885c8e5817ba6874b68accc200bda61ee1 wpxmlrpc: d758b6ad17723d31d06493acc932f6d9b340de95 -PODFILE CHECKSUM: 731846f35dc585c867ce1af029d78c4bfb3bbf5f +PODFILE CHECKSUM: f9986d93ad5deb1c00dc81e674ff8963bc6c0648 COCOAPODS: 1.8.4 From d0f61c04f6661fae84e44d1d2072bfb48efcd4a7 Mon Sep 17 00:00:00 2001 From: Diego Rey Mendez Date: Tue, 10 Mar 2020 19:42:35 -0300 Subject: [PATCH 11/76] Updated the authenticator pod version to 1.11.0-beta.3. --- WordPressAuthenticator.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index b71214376..8c332318c 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressAuthenticator" - s.version = "1.11.0-beta.2" + s.version = "1.11.0-beta.3" s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps." s.description = <<-DESC From 06264d405303b0b6ce47449ebb43f9cefaacd824 Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Wed, 11 Mar 2020 16:14:58 -0600 Subject: [PATCH 12/76] Update NUX buttons when light/dark mode toggled. --- WordPressAuthenticator.podspec | 2 +- WordPressAuthenticator/NUX/NUXButton.swift | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index a1da9c9eb..89c6bec95 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressAuthenticator" - s.version = "1.11.0-beta.3" + s.version = "1.11.0-beta.4" s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps." s.description = <<-DESC diff --git a/WordPressAuthenticator/NUX/NUXButton.swift b/WordPressAuthenticator/NUX/NUXButton.swift index 8a0d52927..e68d6ebff 100644 --- a/WordPressAuthenticator/NUX/NUXButton.swift +++ b/WordPressAuthenticator/NUX/NUXButton.swift @@ -41,6 +41,14 @@ import WordPressUI } } + open override func tintColorDidChange() { + // Update colors when toggling light/dark mode. + super.tintColorDidChange() + configureBackgrounds() + configureTitleColors() + } + + // MARK: - Instance Methods From 3ecb89c5290952885c572d080e6f0724c697a7ad Mon Sep 17 00:00:00 2001 From: Giorgio Ruscigno Date: Thu, 12 Mar 2020 13:52:25 -0500 Subject: [PATCH 13/76] Update version of NSURL+IDN to 0.4 --- Podfile | 2 +- Podfile.lock | 8 +++---- WordPressAuthenticator.podspec | 2 +- .../xcschemes/WordPressAuthenticator.xcscheme | 24 ++++++++----------- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/Podfile b/Podfile index d716dfef2..755d68c55 100644 --- a/Podfile +++ b/Podfile @@ -23,7 +23,7 @@ def wordpress_authenticator_pods pod 'CocoaLumberjack', '3.5.2' pod 'GoogleSignIn', '4.4.0' pod 'lottie-ios', '2.5.2' - pod 'NSURL+IDN', '0.3' + pod 'NSURL+IDN', '0.4' pod 'SVProgressHUD', '2.2.5' end diff --git a/Podfile.lock b/Podfile.lock index f8d425a69..9bfde93b3 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -24,7 +24,7 @@ PODS: - GTMSessionFetcher/Core (1.3.1) - lottie-ios (2.5.2) - NSObject-SafeExpectations (0.0.3) - - "NSURL+IDN (0.3)" + - "NSURL+IDN (0.4)" - OCMock (3.6) - OHHTTPStubs (8.0.0): - OHHTTPStubs/Default (= 8.0.0) @@ -65,7 +65,7 @@ DEPENDENCIES: - GoogleSignIn (= 4.4.0) - Gridicons (~> 0.20-beta.1) - lottie-ios (= 2.5.2) - - "NSURL+IDN (= 0.3)" + - "NSURL+IDN (= 0.4)" - OCMock (~> 3.4) - OHHTTPStubs (= 8.0.0) - OHHTTPStubs/Swift (= 8.0.0) @@ -111,7 +111,7 @@ SPEC CHECKSUMS: GTMSessionFetcher: cea130bbfe5a7edc8d06d3f0d17288c32ffe9925 lottie-ios: 3fef45d3fabe63e3c7c2eb603dd64ddfffc73062 NSObject-SafeExpectations: b989b68a8a9b7b9f2b264a8b52ba9d7aab8f3129 - "NSURL+IDN": 82355a0afd532fe1de08f6417c134b49b1a1c4b3 + "NSURL+IDN": afc873e639c18138a1589697c3add197fe8679ca OCMock: 5ea90566be239f179ba766fd9fbae5885040b992 OHHTTPStubs: 9cbce6364bec557cc3439aa6bb7514670d780881 Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66 @@ -122,6 +122,6 @@ SPEC CHECKSUMS: WordPressUI: ce0ac522146dabcd0a68ace24c0104dfdf6f4b0d wpxmlrpc: d758b6ad17723d31d06493acc932f6d9b340de95 -PODFILE CHECKSUM: 52b3df23b7561e96f203b0752935d9e9477b1f10 +PODFILE CHECKSUM: ca3bc3f2f64b30695a77edc0565eee0486e3853a COCOAPODS: 1.8.4 diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index 89c6bec95..9115e9488 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressAuthenticator" - s.version = "1.11.0-beta.4" + s.version = "1.11.0-beta.5" s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps." s.description = <<-DESC diff --git a/WordPressAuthenticator.xcodeproj/xcshareddata/xcschemes/WordPressAuthenticator.xcscheme b/WordPressAuthenticator.xcodeproj/xcshareddata/xcschemes/WordPressAuthenticator.xcscheme index 0182e3af4..3941b57e6 100644 --- a/WordPressAuthenticator.xcodeproj/xcshareddata/xcschemes/WordPressAuthenticator.xcscheme +++ b/WordPressAuthenticator.xcodeproj/xcshareddata/xcschemes/WordPressAuthenticator.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -39,17 +48,6 @@ - - - - - - - - Date: Thu, 12 Mar 2020 16:14:50 -0500 Subject: [PATCH 14/76] Point to updated WordPressKit 4.6.0-beta.2 -> 4.6.0-beta.6 --- Podfile | 6 +++--- Podfile.lock | 33 +++++++++++++++++++++------------ 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/Podfile b/Podfile index d716dfef2..f7daad9c4 100644 --- a/Podfile +++ b/Podfile @@ -11,8 +11,8 @@ def wordpress_authenticator_pods ## pod 'Gridicons', '~> 0.20-beta.1' pod 'WordPressUI', '~> 1.4-beta.1' - pod 'WordPressKit', '~> 4.6.0-beta.2' - #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'issue/224-update-wpxmlrpc-pod' + #pod 'WordPressKit', '~> 4.6.0-beta.6' + pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'issue/79-migrate-swift-5' pod 'WordPressShared', '~> 1.8.13' ## Third party libraries @@ -23,7 +23,7 @@ def wordpress_authenticator_pods pod 'CocoaLumberjack', '3.5.2' pod 'GoogleSignIn', '4.4.0' pod 'lottie-ios', '2.5.2' - pod 'NSURL+IDN', '0.3' + pod 'NSURL+IDN', '0.4' pod 'SVProgressHUD', '2.2.5' end diff --git a/Podfile.lock b/Podfile.lock index f8d425a69..3d50170f6 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -23,8 +23,8 @@ PODS: - Gridicons (0.20-beta.1) - GTMSessionFetcher/Core (1.3.1) - lottie-ios (2.5.2) - - NSObject-SafeExpectations (0.0.3) - - "NSURL+IDN (0.3)" + - NSObject-SafeExpectations (0.0.4) + - "NSURL+IDN (0.4)" - OCMock (3.6) - OHHTTPStubs (8.0.0): - OHHTTPStubs/Default (= 8.0.0) @@ -44,12 +44,12 @@ PODS: - Specta (1.0.7) - SVProgressHUD (2.2.5) - UIDeviceIdentifier (1.4.0) - - WordPressKit (4.6.0-beta.2): + - WordPressKit (4.6.0-beta.6): - Alamofire (~> 4.8.0) - CocoaLumberjack (~> 3.4) - - NSObject-SafeExpectations (= 0.0.3) + - NSObject-SafeExpectations (= 0.0.4) - UIDeviceIdentifier (~> 1) - - WordPressShared (~> 1.8.13-beta) + - WordPressShared (~> 1.8.15-beta) - wpxmlrpc (= 0.8.5-beta.1) - WordPressShared (1.8.15): - CocoaLumberjack (~> 3.4) @@ -65,13 +65,13 @@ DEPENDENCIES: - GoogleSignIn (= 4.4.0) - Gridicons (~> 0.20-beta.1) - lottie-ios (= 2.5.2) - - "NSURL+IDN (= 0.3)" + - "NSURL+IDN (= 0.4)" - OCMock (~> 3.4) - OHHTTPStubs (= 8.0.0) - OHHTTPStubs/Swift (= 8.0.0) - Specta (= 1.0.7) - SVProgressHUD (= 2.2.5) - - WordPressKit (~> 4.6.0-beta.2) + - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, branch `issue/79-migrate-swift-5`) - WordPressShared (~> 1.8.13) - WordPressUI (~> 1.4-beta.1) @@ -94,11 +94,20 @@ SPEC REPOS: - Specta - SVProgressHUD - UIDeviceIdentifier - - WordPressKit - WordPressShared - WordPressUI - wpxmlrpc +EXTERNAL SOURCES: + WordPressKit: + :branch: issue/79-migrate-swift-5 + :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git + +CHECKOUT OPTIONS: + WordPressKit: + :commit: 1a219b3095835dc204fded6eeb13c7e3a09850d7 + :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git + SPEC CHECKSUMS: 1PasswordExtension: 0e95bdea64ec8ff2f4f693be5467a09fac42a83d Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844 @@ -110,18 +119,18 @@ SPEC CHECKSUMS: Gridicons: a89c04840b560895223a2c5c1e1299b518e0fc6f GTMSessionFetcher: cea130bbfe5a7edc8d06d3f0d17288c32ffe9925 lottie-ios: 3fef45d3fabe63e3c7c2eb603dd64ddfffc73062 - NSObject-SafeExpectations: b989b68a8a9b7b9f2b264a8b52ba9d7aab8f3129 - "NSURL+IDN": 82355a0afd532fe1de08f6417c134b49b1a1c4b3 + NSObject-SafeExpectations: ab8fe623d36b25aa1f150affa324e40a2f3c0374 + "NSURL+IDN": afc873e639c18138a1589697c3add197fe8679ca OCMock: 5ea90566be239f179ba766fd9fbae5885040b992 OHHTTPStubs: 9cbce6364bec557cc3439aa6bb7514670d780881 Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66 SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6 UIDeviceIdentifier: 44f805037d21b94394821828f4fcaba34b38c2d0 - WordPressKit: 36f3dd07e27cee3153ea0d77b9802bc4fec48c19 + WordPressKit: c6f6f2b4a47bd042bfb35f4f7b0225fd857d5007 WordPressShared: 02e0947034648cbd7251ffcc10f64d512f93a53b WordPressUI: ce0ac522146dabcd0a68ace24c0104dfdf6f4b0d wpxmlrpc: d758b6ad17723d31d06493acc932f6d9b340de95 -PODFILE CHECKSUM: 52b3df23b7561e96f203b0752935d9e9477b1f10 +PODFILE CHECKSUM: 4e08e8480e3428d23186cd6b917e3842616619dd COCOAPODS: 1.8.4 From baf20c3204bc105decdf96a295a3c670f3f2392e Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Thu, 12 Mar 2020 16:15:23 -0500 Subject: [PATCH 15/76] Update podspec to beta.6 --- WordPressAuthenticator.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index 89c6bec95..554b2a9be 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressAuthenticator" - s.version = "1.11.0-beta.4" + s.version = "1.11.0-beta.6" s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps." s.description = <<-DESC From 21860953d676d165aa2e53e2f877071ef2b6e683 Mon Sep 17 00:00:00 2001 From: Giorgio Ruscigno Date: Thu, 12 Mar 2020 18:05:16 -0500 Subject: [PATCH 16/76] Update NSURL+IDN dependency in podspec --- WordPressAuthenticator.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index 9115e9488..149f4060e 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -34,7 +34,7 @@ Pod::Spec.new do |s| s.dependency 'Alamofire', '4.8' s.dependency 'CocoaLumberjack', '~> 3.5' s.dependency 'lottie-ios', '2.5.2' - s.dependency 'NSURL+IDN', '0.3' + s.dependency 'NSURL+IDN', '0.4' s.dependency 'SVProgressHUD', '2.2.5' s.dependency 'Gridicons', '~> 0.20-beta.1' From 392de8efda4f1f713cd5df75b5ebc2eabefed2c5 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Fri, 13 Mar 2020 15:28:43 -0500 Subject: [PATCH 17/76] Update podfile to point to published WordPressKit version 4.6.0-beta.6 And update the podspec to reflect the correct dependency --- Podfile | 4 ++-- Podfile.lock | 15 +++------------ WordPressAuthenticator.podspec | 2 +- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/Podfile b/Podfile index f7daad9c4..ea301c996 100644 --- a/Podfile +++ b/Podfile @@ -11,8 +11,8 @@ def wordpress_authenticator_pods ## pod 'Gridicons', '~> 0.20-beta.1' pod 'WordPressUI', '~> 1.4-beta.1' - #pod 'WordPressKit', '~> 4.6.0-beta.6' - pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'issue/79-migrate-swift-5' + pod 'WordPressKit', '~> 4.6.0-beta.6' + #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'issue/79-migrate-swift-5' pod 'WordPressShared', '~> 1.8.13' ## Third party libraries diff --git a/Podfile.lock b/Podfile.lock index 3d50170f6..999c0edf1 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -71,7 +71,7 @@ DEPENDENCIES: - OHHTTPStubs/Swift (= 8.0.0) - Specta (= 1.0.7) - SVProgressHUD (= 2.2.5) - - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, branch `issue/79-migrate-swift-5`) + - WordPressKit (~> 4.6.0-beta.6) - WordPressShared (~> 1.8.13) - WordPressUI (~> 1.4-beta.1) @@ -94,20 +94,11 @@ SPEC REPOS: - Specta - SVProgressHUD - UIDeviceIdentifier + - WordPressKit - WordPressShared - WordPressUI - wpxmlrpc -EXTERNAL SOURCES: - WordPressKit: - :branch: issue/79-migrate-swift-5 - :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git - -CHECKOUT OPTIONS: - WordPressKit: - :commit: 1a219b3095835dc204fded6eeb13c7e3a09850d7 - :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git - SPEC CHECKSUMS: 1PasswordExtension: 0e95bdea64ec8ff2f4f693be5467a09fac42a83d Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844 @@ -131,6 +122,6 @@ SPEC CHECKSUMS: WordPressUI: ce0ac522146dabcd0a68ace24c0104dfdf6f4b0d wpxmlrpc: d758b6ad17723d31d06493acc932f6d9b340de95 -PODFILE CHECKSUM: 4e08e8480e3428d23186cd6b917e3842616619dd +PODFILE CHECKSUM: 068e02be265114c0d3e8b5505b680cb23aceddcd COCOAPODS: 1.8.4 diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index 7d4efb0a9..a128e5506 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -40,6 +40,6 @@ Pod::Spec.new do |s| s.dependency 'Gridicons', '~> 0.20-beta.1' s.dependency 'GoogleSignIn', '~> 4.4' s.dependency 'WordPressUI', '~> 1.4-beta.1' - s.dependency 'WordPressKit', '~> 4.6.0-beta.2' + s.dependency 'WordPressKit', '~> 4.6.0-beta.6' s.dependency 'WordPressShared', '~> 1.8.13-beta' end From 738125d8dc787418cbfa796e98d6ef3dd97f20f1 Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Fri, 13 Mar 2020 14:48:42 -0600 Subject: [PATCH 18/76] Update WP signup button style. --- WordPressAuthenticator.podspec | 2 +- WordPressAuthenticator/Extensions/WPStyleGuide+Login.swift | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index 149f4060e..7d4efb0a9 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressAuthenticator" - s.version = "1.11.0-beta.5" + s.version = "1.11.0-beta.6" s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps." s.description = <<-DESC diff --git a/WordPressAuthenticator/Extensions/WPStyleGuide+Login.swift b/WordPressAuthenticator/Extensions/WPStyleGuide+Login.swift index 73e105674..5b32d40ce 100644 --- a/WordPressAuthenticator/Extensions/WPStyleGuide+Login.swift +++ b/WordPressAuthenticator/Extensions/WPStyleGuide+Login.swift @@ -184,10 +184,10 @@ extension WPStyleGuide { /// - Note: This button is only used during Jetpack setup, not the usual flows /// class func wpcomSignupButton() -> UIButton { + let style = WordPressAuthenticator.shared.style let baseString = NSLocalizedString("Don't have an account? _Sign up_", comment: "Label for button to log in using your site address. The underscores _..._ denote underline") - let attrStrNormal = baseString.underlined(color: WPStyleGuide.greyDarken20(), underlineColor: WPStyleGuide.wordPressBlue()) - let attrStrHighlight = baseString.underlined(color: WPStyleGuide.greyDarken20(), underlineColor: WPStyleGuide.lightBlue()) - + let attrStrNormal = baseString.underlined(color: style.subheadlineColor, underlineColor: style.textButtonColor) + let attrStrHighlight = baseString.underlined(color: style.subheadlineColor, underlineColor: style.textButtonHighlightColor) let font = WPStyleGuide.mediumWeightFont(forStyle: .subheadline) return textButton(normal: attrStrNormal, highlighted: attrStrHighlight, font: font) From fed705442008cd767fc5e1acb10bba1cd9b23a8e Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Fri, 13 Mar 2020 15:01:54 -0600 Subject: [PATCH 19/76] Updating pod version. --- WordPressAuthenticator.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index a128e5506..7c8ce54f8 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressAuthenticator" - s.version = "1.11.0-beta.6" + s.version = "1.11.0-beta.7" s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps." s.description = <<-DESC From ad39c0074208f1ac75ff71952179fda65743152a Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Mon, 16 Mar 2020 09:34:37 -0500 Subject: [PATCH 20/76] Update podspec version and dependency versions --- WordPressAuthenticator.podspec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index a128e5506..987c54389 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressAuthenticator" - s.version = "1.11.0-beta.6" + s.version = "1.11.0-beta.8" s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps." s.description = <<-DESC @@ -37,9 +37,9 @@ Pod::Spec.new do |s| s.dependency 'NSURL+IDN', '0.4' s.dependency 'SVProgressHUD', '2.2.5' - s.dependency 'Gridicons', '~> 0.20-beta.1' + s.dependency 'Gridicons', '~> 0.20-beta' s.dependency 'GoogleSignIn', '~> 4.4' - s.dependency 'WordPressUI', '~> 1.4-beta.1' + s.dependency 'WordPressUI', '~> 1.5-beta' s.dependency 'WordPressKit', '~> 4.6.0-beta.6' - s.dependency 'WordPressShared', '~> 1.8.13-beta' + s.dependency 'WordPressShared', '~> 1.8.16-beta' end From 4cf71ce9236ded0c798607eb461388e4bf5ab9d6 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Mon, 16 Mar 2020 09:35:06 -0500 Subject: [PATCH 21/76] Update podfile.lock - dependency versions and checksums --- Podfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 999c0edf1..0e09f8c0e 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -51,10 +51,10 @@ PODS: - UIDeviceIdentifier (~> 1) - WordPressShared (~> 1.8.15-beta) - wpxmlrpc (= 0.8.5-beta.1) - - WordPressShared (1.8.15): + - WordPressShared (1.8.16-beta.1): - CocoaLumberjack (~> 3.4) - FormatterKit/TimeIntervalFormatter (= 1.8.2) - - WordPressUI (1.5.1) + - WordPressUI (1.5.2-beta.1) - wpxmlrpc (0.8.5-beta.1) DEPENDENCIES: @@ -118,8 +118,8 @@ SPEC CHECKSUMS: SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6 UIDeviceIdentifier: 44f805037d21b94394821828f4fcaba34b38c2d0 WordPressKit: c6f6f2b4a47bd042bfb35f4f7b0225fd857d5007 - WordPressShared: 02e0947034648cbd7251ffcc10f64d512f93a53b - WordPressUI: ce0ac522146dabcd0a68ace24c0104dfdf6f4b0d + WordPressShared: ddcb40e608bc0f0162cce5e8df006584febcec50 + WordPressUI: 77907b59f39530af1003a30e6148a3ad0d2b179f wpxmlrpc: d758b6ad17723d31d06493acc932f6d9b340de95 PODFILE CHECKSUM: 068e02be265114c0d3e8b5505b680cb23aceddcd From e676bbbcc2336ed3cdc1c073c1e09411bd1bed78 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Mon, 16 Mar 2020 10:57:15 -0500 Subject: [PATCH 22/76] Update Lottie pod --- Podfile | 2 +- Podfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Podfile b/Podfile index ea301c996..999732368 100644 --- a/Podfile +++ b/Podfile @@ -22,7 +22,7 @@ def wordpress_authenticator_pods pod 'Alamofire', '4.8' pod 'CocoaLumberjack', '3.5.2' pod 'GoogleSignIn', '4.4.0' - pod 'lottie-ios', '2.5.2' + pod 'lottie-ios', '3.1.6' pod 'NSURL+IDN', '0.4' pod 'SVProgressHUD', '2.2.5' end diff --git a/Podfile.lock b/Podfile.lock index 999c0edf1..9398e2a8e 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -22,7 +22,7 @@ PODS: - "GoogleToolboxForMac/NSString+URLArguments (2.2.2)" - Gridicons (0.20-beta.1) - GTMSessionFetcher/Core (1.3.1) - - lottie-ios (2.5.2) + - lottie-ios (3.1.6) - NSObject-SafeExpectations (0.0.4) - "NSURL+IDN (0.4)" - OCMock (3.6) @@ -64,7 +64,7 @@ DEPENDENCIES: - Expecta (= 1.0.6) - GoogleSignIn (= 4.4.0) - Gridicons (~> 0.20-beta.1) - - lottie-ios (= 2.5.2) + - lottie-ios (= 3.1.6) - "NSURL+IDN (= 0.4)" - OCMock (~> 3.4) - OHHTTPStubs (= 8.0.0) @@ -109,7 +109,7 @@ SPEC CHECKSUMS: GoogleToolboxForMac: 800648f8b3127618c1b59c7f97684427630c5ea3 Gridicons: a89c04840b560895223a2c5c1e1299b518e0fc6f GTMSessionFetcher: cea130bbfe5a7edc8d06d3f0d17288c32ffe9925 - lottie-ios: 3fef45d3fabe63e3c7c2eb603dd64ddfffc73062 + lottie-ios: 85ce835dd8c53e02509f20729fc7d6a4e6645a0a NSObject-SafeExpectations: ab8fe623d36b25aa1f150affa324e40a2f3c0374 "NSURL+IDN": afc873e639c18138a1589697c3add197fe8679ca OCMock: 5ea90566be239f179ba766fd9fbae5885040b992 @@ -122,6 +122,6 @@ SPEC CHECKSUMS: WordPressUI: ce0ac522146dabcd0a68ace24c0104dfdf6f4b0d wpxmlrpc: d758b6ad17723d31d06493acc932f6d9b340de95 -PODFILE CHECKSUM: 068e02be265114c0d3e8b5505b680cb23aceddcd +PODFILE CHECKSUM: 03cc79718f43514bcbc8fcda080d47758031a031 COCOAPODS: 1.8.4 From 2bd7f8c7a574e8842bacdc5eb27f215dd56fbc94 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Mon, 16 Mar 2020 10:57:27 -0500 Subject: [PATCH 23/76] Migrate from Lottie 2.5.2 -> 3.1.6 --- .../Signin/LoginProloguePromoViewController.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/WordPressAuthenticator/Signin/LoginProloguePromoViewController.swift b/WordPressAuthenticator/Signin/LoginProloguePromoViewController.swift index b3cc409df..1a39a1165 100644 --- a/WordPressAuthenticator/Signin/LoginProloguePromoViewController.swift +++ b/WordPressAuthenticator/Signin/LoginProloguePromoViewController.swift @@ -8,7 +8,7 @@ class LoginProloguePromoViewController: UIViewController { fileprivate let stackView: UIStackView fileprivate let headingLabel: UILabel fileprivate let animationHolder: UIView - fileprivate var animationView: LOTAnimationView + fileprivate var animationView: AnimationView fileprivate struct Constants { static let stackSpacing: CGFloat = 36.0 @@ -41,7 +41,7 @@ class LoginProloguePromoViewController: UIViewController { case .notifications: return NSLocalizedString("Your notifications travel with you — see comments and likes as they happen.", comment: "shown in promotional screens during first launch") case .jetpack: - return NSLocalizedString("Manage your Jetpack-powered site on the go — you‘ve got WordPress in your pocket.", comment: "shown in promotional screens during first launch") + return NSLocalizedString("Manage your Jetpack-powered site on the go — you've got WordPress in your pocket.", comment: "shown in promotional screens during first launch") } } @@ -57,7 +57,7 @@ class LoginProloguePromoViewController: UIViewController { animationHolder = UIView() let bundle = WordPressAuthenticator.bundle - animationView = LOTAnimationView(name: type.animationKey, bundle: bundle) + animationView = AnimationView(name: type.animationKey, bundle: bundle) super.init(nibName: nil, bundle: nil) } @@ -96,7 +96,7 @@ class LoginProloguePromoViewController: UIViewController { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) - animationView.animationProgress = 0.0 + animationView.currentProgress = 0.0 } override func viewDidAppear(_ animated: Bool) { From 41258f154ad10a2849658423b15b04c92c22cd24 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Mon, 16 Mar 2020 10:58:15 -0500 Subject: [PATCH 24/76] Correct autolayout warnings in Login.storyboard --- .../Signin/Login.storyboard | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/WordPressAuthenticator/Signin/Login.storyboard b/WordPressAuthenticator/Signin/Login.storyboard index 77ca59996..7f03ebabc 100644 --- a/WordPressAuthenticator/Signin/Login.storyboard +++ b/WordPressAuthenticator/Signin/Login.storyboard @@ -1,9 +1,9 @@ - + - + @@ -207,8 +207,8 @@ - - + + @@ -403,29 +403,29 @@ - + - + - + - +