From 6b9de63f9c312ab546b31b895d73c9d3e9aafff1 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Mon, 23 Mar 2020 15:34:45 -0500 Subject: [PATCH 1/3] Point update Auth and Auth's dependent pods to remove the .showLinkMailView segue --- Podfile | 10 ++++----- Podfile.lock | 57 ++++++++++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/Podfile b/Podfile index 15aa3432b01..82dd4503c12 100644 --- a/Podfile +++ b/Podfile @@ -22,16 +22,16 @@ target 'WooCommerce' do #pod 'Automattic-Tracks-iOS', :git => 'https://github.com/Automattic/Automattic-Tracks-iOS.git', :tag => '0.2.4-beta.1' pod 'Automattic-Tracks-iOS', '~> 0.4.4-beta' - pod 'Gridicons', '~> 1.0-beta' + pod 'Gridicons', '~> 1.0' # To allow pod to pick up beta versions use -beta. E.g., 1.1.7-beta.1 - #pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => '' - pod 'WordPressAuthenticator', '~> 1.11.0-beta.15' + pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => 'issue/211-remove-showLinkMailView' + #pod 'WordPressAuthenticator', '~> 1.11.2-beta.1' # pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :branch => 'task/support-swift-5' - pod 'WordPressShared', '~> 1.8.16-beta' + pod 'WordPressShared', '~> 1.8.16' - pod 'WordPressUI', '~> 1.5.2-beta' + pod 'WordPressUI', '~> 1.5.2' pod 'WordPress-Editor-iOS', '~> 1.11.0' diff --git a/Podfile.lock b/Podfile.lock index b364ad9f900..6451b14ea4d 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -29,7 +29,7 @@ PODS: - GoogleToolboxForMac/Defines (= 2.2.2) - "GoogleToolboxForMac/NSString+URLArguments (= 2.2.2)" - "GoogleToolboxForMac/NSString+URLArguments (2.2.2)" - - Gridicons (1.0-beta.1) + - Gridicons (1.0) - GTMSessionFetcher/Core (1.3.1) - KeychainAccess (3.2.1) - Kingfisher (5.11.0): @@ -47,32 +47,32 @@ PODS: - WordPress-Aztec-iOS (1.11.0) - WordPress-Editor-iOS (1.11.0): - WordPress-Aztec-iOS (= 1.11.0) - - WordPressAuthenticator (1.11.0-beta.15): + - WordPressAuthenticator (1.11.2-beta.1): - 1PasswordExtension (= 1.8.6) - Alamofire (= 4.8) - CocoaLumberjack (~> 3.5) - GoogleSignIn (~> 4.4) - - Gridicons (~> 1.0-beta.1) + - Gridicons (~> 1.0) - lottie-ios (= 3.1.6) - "NSURL+IDN (= 0.4)" - SVProgressHUD (= 2.2.5) - - WordPressKit (~> 4.6.0-beta.8) - - WordPressShared (~> 1.8.16-beta) - - WordPressUI (~> 1.5-beta) - - WordPressKit (4.6.0-beta.8): + - WordPressKit (~> 4.6.0) + - WordPressShared (~> 1.8.16) + - WordPressUI (~> 1.5.2) + - WordPressKit (4.6.0): - Alamofire (~> 4.8.0) - CocoaLumberjack (~> 3.4) - NSObject-SafeExpectations (= 0.0.4) - UIDeviceIdentifier (~> 1) - - WordPressShared (~> 1.8.15-beta) - - wpxmlrpc (= 0.8.5-beta.1) - - WordPressShared (1.8.16-beta.1): + - WordPressShared (~> 1.8.16) + - wpxmlrpc (= 0.8.5) + - WordPressShared (1.8.16): - CocoaLumberjack (~> 3.4) - FormatterKit/TimeIntervalFormatter (= 1.8.2) - - WordPressUI (1.5.2-beta.1) + - WordPressUI (1.5.2) - Wormholy (1.5.1) - WPMediaPicker (1.6.0) - - wpxmlrpc (0.8.5-beta.1) + - wpxmlrpc (0.8.5) - XLPagerTabStrip (9.0.0) - ZendeskCommonUISDK (4.2.0): - ZendeskSDKConfigurationsSDK (~> 1.1.2) @@ -95,13 +95,13 @@ DEPENDENCIES: - Charts (~> 3.3.0) - CocoaLumberjack (~> 3.5) - CocoaLumberjack/Swift (~> 3.5) - - Gridicons (~> 1.0-beta) + - Gridicons (~> 1.0) - KeychainAccess (~> 3.2) - Kingfisher (~> 5.11.0) - WordPress-Editor-iOS (~> 1.11.0) - - WordPressAuthenticator (~> 1.11.0-beta.15) - - WordPressShared (~> 1.8.16-beta) - - WordPressUI (~> 1.5.2-beta) + - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, branch `issue/211-remove-showLinkMailView`) + - WordPressShared (~> 1.8.16) + - WordPressUI (~> 1.5.2) - Wormholy (~> 1.5.1) - WPMediaPicker (~> 1.6.0) - XLPagerTabStrip (~> 9.0) @@ -130,7 +130,6 @@ SPEC REPOS: - UIDeviceIdentifier - WordPress-Aztec-iOS - WordPress-Editor-iOS - - WordPressAuthenticator - WordPressKit - WordPressShared - WordPressUI @@ -146,6 +145,16 @@ SPEC REPOS: - ZendeskSupportProvidersSDK - ZendeskSupportSDK +EXTERNAL SOURCES: + WordPressAuthenticator: + :branch: issue/211-remove-showLinkMailView + :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git + +CHECKOUT OPTIONS: + WordPressAuthenticator: + :commit: 8c8170675e2bfa686ebb9fa7620704623d006432 + :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git + SPEC CHECKSUMS: 1PasswordExtension: f97cc80ae58053c331b2b6dc8843ba7103b33794 Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844 @@ -155,7 +164,7 @@ SPEC CHECKSUMS: FormatterKit: 4b8f29acc9b872d5d12a63efb560661e8f2e1b98 GoogleSignIn: 7ff245e1a7b26d379099d3243a562f5747e23d39 GoogleToolboxForMac: 800648f8b3127618c1b59c7f97684427630c5ea3 - Gridicons: 48ccbe284c39db15cc796af0c523e749683ae061 + Gridicons: f032dbc3350f8648e0fabe3e531b72cf97d428a9 GTMSessionFetcher: cea130bbfe5a7edc8d06d3f0d17288c32ffe9925 KeychainAccess: d5470352939ced6d6f7fb51cb2e67aae51fc294f Kingfisher: 4569606189149e19c7d9439f47e885d0679b7a90 @@ -168,13 +177,13 @@ SPEC CHECKSUMS: UIDeviceIdentifier: 44f805037d21b94394821828f4fcaba34b38c2d0 WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348 WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81 - WordPressAuthenticator: 0a4bd049afda4ab782543de9c0e12ecd90af8e9e - WordPressKit: eb884caeba0fab58ea1e99ceee2403559c4e99a4 - WordPressShared: ddcb40e608bc0f0162cce5e8df006584febcec50 - WordPressUI: 77907b59f39530af1003a30e6148a3ad0d2b179f + WordPressAuthenticator: 0cbfb9fbcafe7da388a4a2ac52cc509131645b9b + WordPressKit: 767cc17ae08894f73f08c852fe124c865a62fb3d + WordPressShared: 1bc316ed162f42af4e0fa2869437e9e28b532b01 + WordPressUI: 70cc58a253c352330b23cd8fa6dd6a2021570e18 Wormholy: f01b096b449a9fcab864a10f7e5b5693b1225c88 WPMediaPicker: e5d28197da6b467d4e5975d64a49255977e39455 - wpxmlrpc: d758b6ad17723d31d06493acc932f6d9b340de95 + wpxmlrpc: 6a9bdd6ab9d1b159b384b0df0f3f39de9af4fecf XLPagerTabStrip: 61c57fd61f611ee5f01ff1495ad6fbee8bf496c5 ZendeskCommonUISDK: afbee7c58c04cf88012a48c079599ec0d1590d16 ZendeskCoreSDK: 86513e62c1ab68913416c9044463d9b687ca944f @@ -184,6 +193,6 @@ SPEC CHECKSUMS: ZendeskSupportProvidersSDK: e183d32abac888c448469e2005c4a5a8c3ed73f0 ZendeskSupportSDK: e52f37fa8bcba91f024b81025869fe5a2860f741 -PODFILE CHECKSUM: 5682daf331331a169c11245f667765b7de8b69ec +PODFILE CHECKSUM: 7a621a849d7ebba2524a045108d7f85c5d265d02 COCOAPODS: 1.9.1 From f26110b710fc293e2810a4473b3e2f268d39c45e Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Mon, 23 Mar 2020 15:59:11 -0500 Subject: [PATCH 2/3] Update the release notes with an Internal update --- RELEASE-NOTES.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index d5da26aa934..f206f5f234e 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,3 +1,7 @@ +4.0 +----- +- [internal] the signup and login Magic Link flows have code changes. See https://git.io/JvyB3 for testing details. + 3.9 ----- - bugfix: now in the Order List the order status label is no more clipped From 21464df4b311eb45a856c327b7d1ec042c62f9c3 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Tue, 24 Mar 2020 08:46:35 -0500 Subject: [PATCH 3/3] Update podfile to point to published version of Auth - 1.11.2-beta.1 --- Podfile | 4 ++-- Podfile.lock | 15 +++------------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/Podfile b/Podfile index 1f6e5c6f13c..1e82b065368 100644 --- a/Podfile +++ b/Podfile @@ -24,9 +24,9 @@ target 'WooCommerce' do pod 'Gridicons', '~> 1.0' + pod 'WordPressAuthenticator', '~> 1.11.2-beta.1' # To allow pod to pick up beta versions use -beta. E.g., 1.1.7-beta.1 - pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => 'issue/211-remove-showLinkMailView' - #pod 'WordPressAuthenticator', '~> 1.11.2-beta.1' + #pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => '' # pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :branch => 'task/support-swift-5' pod 'WordPressShared', '~> 1.8.16' diff --git a/Podfile.lock b/Podfile.lock index e7e8c75e623..24a07fc12fe 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -101,7 +101,7 @@ DEPENDENCIES: - KeychainAccess (~> 3.2) - Kingfisher (~> 5.11.0) - WordPress-Editor-iOS (~> 1.11.0) - - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, branch `issue/211-remove-showLinkMailView`) + - WordPressAuthenticator (~> 1.11.2-beta.1) - WordPressShared (~> 1.8.16) - WordPressUI (~> 1.5.2) - Wormholy (~> 1.5.1) @@ -133,6 +133,7 @@ SPEC REPOS: - UIDeviceIdentifier - WordPress-Aztec-iOS - WordPress-Editor-iOS + - WordPressAuthenticator - WordPressKit - WordPressShared - WordPressUI @@ -148,16 +149,6 @@ SPEC REPOS: - ZendeskSupportProvidersSDK - ZendeskSupportSDK -EXTERNAL SOURCES: - WordPressAuthenticator: - :branch: issue/211-remove-showLinkMailView - :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git - -CHECKOUT OPTIONS: - WordPressAuthenticator: - :commit: 8c8170675e2bfa686ebb9fa7620704623d006432 - :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git - SPEC CHECKSUMS: 1PasswordExtension: f97cc80ae58053c331b2b6dc8843ba7103b33794 Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844 @@ -197,6 +188,6 @@ SPEC CHECKSUMS: ZendeskSupportProvidersSDK: e183d32abac888c448469e2005c4a5a8c3ed73f0 ZendeskSupportSDK: e52f37fa8bcba91f024b81025869fe5a2860f741 -PODFILE CHECKSUM: ceb80100f483af451e35e26e59fcabbd6ad194d8 +PODFILE CHECKSUM: 1fc6543e12a66555e1cd794c166c41693dcab3b5 COCOAPODS: 1.9.1