Skip to content

Integrated updates to both WordPressKit and WordPressAuthenticator #10916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
2 commits merged into from
Jan 31, 2019
Merged

Integrated updates to both WordPressKit and WordPressAuthenticator #10916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b56e66
Integrated updates to both WordPressKit and WordPressAuthenticator
sabaranski Jan 30, 2019
8b037df
Merge branch 'develop' into pods/update-wpkit-wpauth
sabaranski Jan 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def wordpress_ui
end

def wordpress_kit
pod 'WordPressKit', '~> 1.8.0'
pod 'WordPressKit', '~> 2.0.0-beta'
##pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => '28ca4a9'
##pod 'WordPressKit', :path => '~/Developer/a8c/WordPressKit-iOS'
end
Expand Down Expand Up @@ -130,7 +130,7 @@ target 'WordPress' do
## while PR is in review:
## pod 'WPMediaPicker', :git => 'https://github.com/wordpress-mobile/MediaPicker-iOS.git', :commit => 'e546205cd2a992838837b0a4de502507b89b6e63'

pod 'WordPressAuthenticator', '~> 1.1.8'
pod 'WordPressAuthenticator', '~> 1.1.9-beta'
#pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'
#pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git' , :commit => '82900447393674532003833cc1f3a4ad1c53997f'

Expand Down
16 changes: 8 additions & 8 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ PODS:
- WordPress-Aztec-iOS (1.4.1)
- WordPress-Editor-iOS (1.4.1):
- WordPress-Aztec-iOS (= 1.4.1)
- WordPressAuthenticator (1.1.8):
- WordPressAuthenticator (1.1.9-beta.1):
- 1PasswordExtension (= 1.8.5)
- Alamofire (= 4.7.3)
- CocoaLumberjack (= 3.4.2)
Expand All @@ -185,10 +185,10 @@ PODS:
- lottie-ios (= 2.5.2)
- "NSURL+IDN (= 0.3)"
- SVProgressHUD (= 2.2.5)
- WordPressKit (~> 1.8.0)
- WordPressKit (~> 2.0-beta)
- WordPressShared (~> 1.4)
- WordPressUI (~> 1.0)
- WordPressKit (1.8.0):
- WordPressKit (2.0.0-beta.1):
- Alamofire (~> 4.7.3)
- CocoaLumberjack (= 3.4.2)
- NSObject-SafeExpectations (= 0.0.3)
Expand Down Expand Up @@ -244,8 +244,8 @@ DEPENDENCIES:
- Starscream (= 3.0.6)
- SVProgressHUD (= 2.2.5)
- WordPress-Editor-iOS (= 1.4.1)
- WordPressAuthenticator (~> 1.1.8)
- WordPressKit (~> 1.8.0)
- WordPressAuthenticator (~> 1.1.9-beta)
- WordPressKit (~> 2.0.0-beta)
- WordPressShared (~> 1.7.0-beta)
- WordPressUI (from `https://github.com/wordpress-mobile/WordPressUI-iOS.git`, tag `1.2.0`)
- WPMediaPicker (= 1.3.2)
Expand Down Expand Up @@ -376,15 +376,15 @@ SPEC CHECKSUMS:
UIDeviceIdentifier: 8f8a24b257a4d978c8d40ad1e7355b944ffbfa8c
WordPress-Aztec-iOS: 383ea61afd3f96ef4d0c7e3f1ab8e7a362f5cd67
WordPress-Editor-iOS: 617116ef6b454ff11eed2cbdeafc6cf78a54aec2
WordPressAuthenticator: edea3f3cb344c97f2381722286c398a027054d4c
WordPressKit: 23d7de239367cfea9f9eef8aefe1933e47566cf2
WordPressAuthenticator: 40ed3d920f134227a6ab069576378293c0bda401
WordPressKit: 2b6f01a7459d358b8cf6d825348c6cf7174107b2
WordPressShared: 9889ea6eaeb951df12e2901f98bd194df728d2a1
WordPressUI: 44fe43a9c5c504dfd534286e39e1ce6ebcd69ff5
WPMediaPicker: e50edd8f30f5d87288840941ef3ff9cd11860937
wpxmlrpc: 6ba55c773cfa27083ae4a2173e69b19f46da98e2
yoga: f37b1edbd68be803f1dc4d57d40d8a5b277d8e2c
ZendeskSDK: 44ee00338dd718495f0364369420ae11b389c878

PODFILE CHECKSUM: 42b7fc1042c1669e30c37b12d6d4816a83bc4133
PODFILE CHECKSUM: a2c40317ac8d99c5daf61d7698b9071cf9560005

COCOAPODS: 1.5.3