From a2d3707cd952f32ace89b8ad99939ee9ac5cf869 Mon Sep 17 00:00:00 2001 From: stevebaranski Date: Sun, 24 Feb 2019 17:36:58 -0800 Subject: [PATCH 1/3] Updated Podfile to absorb changes to WordPressKit --- Podfile | 4 ++-- Podfile.lock | 15 ++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Podfile b/Podfile index deeebcfb4572..4c6de0822dce 100644 --- a/Podfile +++ b/Podfile @@ -52,8 +52,8 @@ def wordpress_ui end def wordpress_kit - pod 'WordPressKit', '~> 2.1.0-beta.1' - #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => '3886f1d' + #pod 'WordPressKit', '~> 2.1.0-beta.1' + pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => 'ccf4322' #pod 'WordPressKit', :path => '~/Developer/a8c/WordPressKit-iOS' end diff --git a/Podfile.lock b/Podfile.lock index 9c773a39607d..6cd5c8d57d51 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -191,7 +191,7 @@ PODS: - WordPressKit (~> 2.0-beta) - WordPressShared (~> 1.4) - WordPressUI (~> 1.0) - - WordPressKit (2.1.0-beta.2): + - WordPressKit (2.1.1-beta.1): - Alamofire (~> 4.7.3) - CocoaLumberjack (= 3.4.2) - NSObject-SafeExpectations (= 0.0.3) @@ -249,7 +249,7 @@ DEPENDENCIES: - SVProgressHUD (= 2.2.5) - WordPress-Editor-iOS (= 1.4.3) - WordPressAuthenticator (~> 1.1.9) - - WordPressKit (~> 2.1.0-beta.1) + - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `ccf4322`) - WordPressShared (= 1.7.1-beta.3) - WordPressUI (from `https://github.com/wordpress-mobile/WordPressUI-iOS.git`, tag `1.2.0`) - WPMediaPicker (= 1.3.2) @@ -291,7 +291,6 @@ SPEC REPOS: - WordPress-Aztec-iOS - WordPress-Editor-iOS - WordPressAuthenticator - - WordPressKit - WordPressShared - WPMediaPicker - wpxmlrpc @@ -319,6 +318,9 @@ EXTERNAL SOURCES: RNTAztecView: :git: https://github.com/wordpress-mobile/gutenberg-mobile/ :tag: v1.0.0 + WordPressKit: + :commit: ccf4322 + :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git WordPressUI: :git: https://github.com/wordpress-mobile/WordPressUI-iOS.git :tag: 1.2.0 @@ -341,6 +343,9 @@ CHECKOUT OPTIONS: RNTAztecView: :git: https://github.com/wordpress-mobile/gutenberg-mobile/ :tag: v1.0.0 + WordPressKit: + :commit: ccf4322 + :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git WordPressUI: :git: https://github.com/wordpress-mobile/WordPressUI-iOS.git :tag: 1.2.0 @@ -387,7 +392,7 @@ SPEC CHECKSUMS: WordPress-Aztec-iOS: 0062ba96c3ea77186590c74b761427c461f89a06 WordPress-Editor-iOS: cfaa780c3ee64ea781fe6f52ca1561667a3f3707 WordPressAuthenticator: 9559bc45373f1b6c2f58d664d34f564bcf73111f - WordPressKit: 7d4e523fe984ecb913342a456d458f50844f416b + WordPressKit: 4f28a2ec238ec5ea26089e2326e1495f83321e86 WordPressShared: 9aa275b9970e80136f30d5d0611f890a6dd68c65 WordPressUI: 44fe43a9c5c504dfd534286e39e1ce6ebcd69ff5 WPMediaPicker: e50edd8f30f5d87288840941ef3ff9cd11860937 @@ -395,6 +400,6 @@ SPEC CHECKSUMS: yoga: f37b1edbd68be803f1dc4d57d40d8a5b277d8e2c ZendeskSDK: 44ee00338dd718495f0364369420ae11b389c878 -PODFILE CHECKSUM: 2ad50981670069bcd7bf2f5cfdee79902c808eac +PODFILE CHECKSUM: 8409360a2cb7de74651003078a3c6d11f4465d33 COCOAPODS: 1.5.3 From 148dea519fa81bb2ddd40300262e0d9c272065ad Mon Sep 17 00:00:00 2001 From: stevebaranski Date: Mon, 25 Feb 2019 10:07:31 -0800 Subject: [PATCH 2/3] Transitioned to proper WordPressKit version --- Podfile | 4 ++-- Podfile.lock | 11 +++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Podfile b/Podfile index 4c6de0822dce..25ad5e989ec6 100644 --- a/Podfile +++ b/Podfile @@ -52,8 +52,8 @@ def wordpress_ui end def wordpress_kit - #pod 'WordPressKit', '~> 2.1.0-beta.1' - pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => 'ccf4322' + pod 'WordPressKit', '~> 2.1.1-beta.1' + #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => 'ccf4322' #pod 'WordPressKit', :path => '~/Developer/a8c/WordPressKit-iOS' end diff --git a/Podfile.lock b/Podfile.lock index 6cd5c8d57d51..e3fda6f83c49 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -249,7 +249,7 @@ DEPENDENCIES: - SVProgressHUD (= 2.2.5) - WordPress-Editor-iOS (= 1.4.3) - WordPressAuthenticator (~> 1.1.9) - - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `ccf4322`) + - WordPressKit (~> 2.1.1-beta.1) - WordPressShared (= 1.7.1-beta.3) - WordPressUI (from `https://github.com/wordpress-mobile/WordPressUI-iOS.git`, tag `1.2.0`) - WPMediaPicker (= 1.3.2) @@ -291,6 +291,7 @@ SPEC REPOS: - WordPress-Aztec-iOS - WordPress-Editor-iOS - WordPressAuthenticator + - WordPressKit - WordPressShared - WPMediaPicker - wpxmlrpc @@ -318,9 +319,6 @@ EXTERNAL SOURCES: RNTAztecView: :git: https://github.com/wordpress-mobile/gutenberg-mobile/ :tag: v1.0.0 - WordPressKit: - :commit: ccf4322 - :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git WordPressUI: :git: https://github.com/wordpress-mobile/WordPressUI-iOS.git :tag: 1.2.0 @@ -343,9 +341,6 @@ CHECKOUT OPTIONS: RNTAztecView: :git: https://github.com/wordpress-mobile/gutenberg-mobile/ :tag: v1.0.0 - WordPressKit: - :commit: ccf4322 - :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git WordPressUI: :git: https://github.com/wordpress-mobile/WordPressUI-iOS.git :tag: 1.2.0 @@ -400,6 +395,6 @@ SPEC CHECKSUMS: yoga: f37b1edbd68be803f1dc4d57d40d8a5b277d8e2c ZendeskSDK: 44ee00338dd718495f0364369420ae11b389c878 -PODFILE CHECKSUM: 8409360a2cb7de74651003078a3c6d11f4465d33 +PODFILE CHECKSUM: fbb623be2ecc342f93beff2bbcb81f9bfc46dd86 COCOAPODS: 1.5.3 From 05dc605b84c4758102ccdd2cae1de355644c3364 Mon Sep 17 00:00:00 2001 From: stevebaranski Date: Mon, 25 Feb 2019 11:48:25 -0800 Subject: [PATCH 3/3] Update reference to WordPressShared released version --- Podfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 8d67ff03bd69..f011966ce8a2 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -250,7 +250,7 @@ DEPENDENCIES: - WordPress-Editor-iOS (= 1.4.3) - WordPressAuthenticator (~> 1.1.9) - WordPressKit (~> 2.1.1-beta.1) - - WordPressShared (= 1.7.1-beta.3) + - WordPressShared (= 1.7.1) - WordPressUI (from `https://github.com/wordpress-mobile/WordPressUI-iOS.git`, tag `1.2.0`) - WPMediaPicker (= 1.3.2) - yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/master/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json`) @@ -387,7 +387,7 @@ SPEC CHECKSUMS: WordPress-Aztec-iOS: 0062ba96c3ea77186590c74b761427c461f89a06 WordPress-Editor-iOS: cfaa780c3ee64ea781fe6f52ca1561667a3f3707 WordPressAuthenticator: 9559bc45373f1b6c2f58d664d34f564bcf73111f - WordPressKit: 1296ce8f8b85423ddf0d993deac918e75c5b6896 + WordPressKit: 4f28a2ec238ec5ea26089e2326e1495f83321e86 WordPressShared: 2018257df3fe1de423f31a3ba50ac8d6bd24941c WordPressUI: 44fe43a9c5c504dfd534286e39e1ce6ebcd69ff5 WPMediaPicker: e50edd8f30f5d87288840941ef3ff9cd11860937 @@ -395,6 +395,6 @@ SPEC CHECKSUMS: yoga: f37b1edbd68be803f1dc4d57d40d8a5b277d8e2c ZendeskSDK: 44ee00338dd718495f0364369420ae11b389c878 -PODFILE CHECKSUM: 2c1688ad9f328bb556211b9739772c7300173c1f +PODFILE CHECKSUM: 5223a898160b360f41f28448d371eafa04e11133 COCOAPODS: 1.5.3