Skip to content

Update NSURL+IDN version to 0.4 #13644

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
Gio2018 merged 3 commits into from
Mar 13, 2020
Merged

Update NSURL+IDN version to 0.4 #13644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97461f4
Update Podfile, update NSURL+IDN version to 0.4
Mar 12, 2020
39f3f34
Update Podfile, update WordPressAuthenticator to 1.11.0-beta.6, WordP…
Mar 13, 2020
6a770aa
Merge branch 'develop' of https://github.com/wordpress-mobile/WordPre…
Mar 13, 2020
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
8 changes: 4 additions & 4 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def wordpress_ui
end

def wordpress_kit
pod 'WordPressKit', '~> 4.6.0-beta.5'
pod 'WordPressKit', '~> 4.6.0-beta.6'
#pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => '4.6.0-beta.3'
#pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'fix/datarequest-weak-reference'
#pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => '24af2c192fd628f4c5bb3e9be6c8312cb45260fe'
Expand Down Expand Up @@ -176,7 +176,7 @@ target 'WordPress' do
# While in PR
# pod 'Automattic-Tracks-iOS', :git => 'https://github.com/Automattic/Automattic-Tracks-iOS.git', :branch => 'feature/Swift-5-migration'

pod 'NSURL+IDN', '0.3'
pod 'NSURL+IDN', '0.4'

pod 'WPMediaPicker', '~> 1.6.1-beta.1'
## while PR is in review:
Expand All @@ -187,9 +187,9 @@ target 'WordPress' do
# While in PR
#pod 'Gridicons', :git => 'https://github.com/Automattic/Gridicons-iOS.git', :branch => 'feature/Swift-5-migration'

pod 'WordPressAuthenticator', '~> 1.11.0-beta.4'
pod 'WordPressAuthenticator', '~> 1.11.0-beta.6'
# While in PR
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => 'develop'
# pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'

pod 'MediaEditor', '~> 1.0.1'
Expand Down
26 changes: 13 additions & 13 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ PODS:
- MRProgress/Helper
- Nimble (7.3.4)
- NSObject-SafeExpectations (0.0.4)
- "NSURL+IDN (0.3)"
- "NSURL+IDN (0.4)"
- OCMock (3.4.3)
- OHHTTPStubs (6.1.0):
- OHHTTPStubs/Default (= 6.1.0)
Expand Down Expand Up @@ -372,24 +372,24 @@ PODS:
- WordPress-Aztec-iOS (1.16.0)
- WordPress-Editor-iOS (1.16.0):
- WordPress-Aztec-iOS (= 1.16.0)
- WordPressAuthenticator (1.11.0-beta.4):
- WordPressAuthenticator (1.11.0-beta.6):
- 1PasswordExtension (= 1.8.5)
- Alamofire (= 4.8)
- CocoaLumberjack (~> 3.5)
- GoogleSignIn (~> 4.4)
- Gridicons (~> 0.20-beta.1)
- lottie-ios (= 2.5.2)
- "NSURL+IDN (= 0.3)"
- "NSURL+IDN (= 0.4)"
- SVProgressHUD (= 2.2.5)
- WordPressKit (~> 4.6.0-beta.2)
- WordPressKit (~> 4.6.0-beta.6)
- WordPressShared (~> 1.8.13-beta)
- WordPressUI (~> 1.4-beta.1)
- WordPressKit (4.6.0-beta.5):
- WordPressKit (4.6.0-beta.6):
- Alamofire (~> 4.8.0)
- CocoaLumberjack (~> 3.4)
- NSObject-SafeExpectations (= 0.0.4)
- UIDeviceIdentifier (~> 1)
- WordPressShared (~> 1.8.13-beta)
- WordPressShared (~> 1.8.15-beta)
- wpxmlrpc (= 0.8.5-beta.1)
- WordPressMocks (0.0.8)
- WordPressShared (1.8.16-beta.1):
Expand Down Expand Up @@ -439,7 +439,7 @@ DEPENDENCIES:
- MRProgress (= 0.8.3)
- Nimble (~> 7.3.1)
- NSObject-SafeExpectations (= 0.0.4)
- "NSURL+IDN (= 0.3)"
- "NSURL+IDN (= 0.4)"
- OCMock (= 3.4.3)
- OHHTTPStubs (= 6.1.0)
- OHHTTPStubs/Swift (= 6.1.0)
Expand Down Expand Up @@ -475,8 +475,8 @@ DEPENDENCIES:
- Starscream (= 3.0.6)
- SVProgressHUD (= 2.2.5)
- WordPress-Editor-iOS (~> 1.16.0)
- WordPressAuthenticator (~> 1.11.0-beta.4)
- WordPressKit (~> 4.6.0-beta.5)
- WordPressAuthenticator (~> 1.11.0-beta.6)
- WordPressKit (~> 4.6.0-beta.6)
- WordPressMocks (~> 0.0.8)
- WordPressShared (= 1.8.16-beta.1)
- WordPressUI (~> 1.5.2-beta.1)
Expand Down Expand Up @@ -650,7 +650,7 @@ SPEC CHECKSUMS:
MRProgress: 16de7cc9f347e8846797a770db102a323fe7ef09
Nimble: 051e3d8912d40138fa5591c78594f95fb172af37
NSObject-SafeExpectations: ab8fe623d36b25aa1f150affa324e40a2f3c0374
"NSURL+IDN": 82355a0afd532fe1de08f6417c134b49b1a1c4b3
"NSURL+IDN": afc873e639c18138a1589697c3add197fe8679ca
OCMock: 43565190abc78977ad44a61c0d20d7f0784d35ab
OHHTTPStubs: 1e21c7d2c084b8153fc53d48400d8919d2d432d0
RCTRequired: 3ca691422140f76f04fd2af6dc90914cf0f81ef1
Expand Down Expand Up @@ -689,8 +689,8 @@ SPEC CHECKSUMS:
UIDeviceIdentifier: 44f805037d21b94394821828f4fcaba34b38c2d0
WordPress-Aztec-iOS: 64a2989d25befb5ce086fac440315f696026ffd5
WordPress-Editor-iOS: 63ef6a532af2c92e3301421f5c4af41ad3be8721
WordPressAuthenticator: 6a397573be47bd9f054e79f5241095614c430f82
WordPressKit: 1b4b330f8a5817eccd9b221690dc1151a4c0958e
WordPressAuthenticator: f42d1f3d5a9aa050133ee38394b9c342b2763766
WordPressKit: c6f6f2b4a47bd042bfb35f4f7b0225fd857d5007
WordPressMocks: b4064b99a073117bbc304abe82df78f2fbe60992
WordPressShared: ddcb40e608bc0f0162cce5e8df006584febcec50
WordPressUI: 77907b59f39530af1003a30e6148a3ad0d2b179f
Expand All @@ -706,6 +706,6 @@ SPEC CHECKSUMS:
ZendeskSupportSDK: a87ab1e4badace92c75eb11dc77ede1e995b2adc
ZIPFoundation: 249fa8890597086cd536bb2df5c9804d84e122b0

PODFILE CHECKSUM: ab7aed2775aa1cab8190f63b85750f405829d4b6
PODFILE CHECKSUM: e57cadf568e5de5aa6aa8530bdafdd29366f6d5c

COCOAPODS: 1.8.4