From 97461f4fa06bbc3d5d854ca48b70a3ec651b60ff Mon Sep 17 00:00:00 2001 From: Giorgio Ruscigno Date: Thu, 12 Mar 2020 18:38:31 -0500 Subject: [PATCH] Update Podfile, update NSURL+IDN version to 0.4 --- Podfile | 6 +++--- Podfile.lock | 23 ++++++++++++++--------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Podfile b/Podfile index 8eab207bce09..13d712009ff0 100644 --- a/Podfile +++ b/Podfile @@ -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: @@ -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.4' # 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' diff --git a/Podfile.lock b/Podfile.lock index 593c7591765e..8c8720f536cb 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -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) @@ -372,14 +372,14 @@ 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.5): - 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) - WordPressShared (~> 1.8.13-beta) @@ -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) @@ -475,7 +475,7 @@ DEPENDENCIES: - Starscream (= 3.0.6) - SVProgressHUD (= 2.2.5) - WordPress-Editor-iOS (~> 1.16.0) - - WordPressAuthenticator (~> 1.11.0-beta.4) + - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, branch `develop`) - WordPressKit (~> 4.6.0-beta.5) - WordPressMocks (~> 0.0.8) - WordPressShared (= 1.8.15) @@ -521,7 +521,6 @@ SPEC REPOS: - UIDeviceIdentifier - WordPress-Aztec-iOS - WordPress-Editor-iOS - - WordPressAuthenticator - WordPressKit - WordPressMocks - WordPressShared @@ -607,6 +606,9 @@ EXTERNAL SOURCES: RNTAztecView: :commit: d377b883c761c2a71d29bd631f3d3227b3e313a2 :git: https://github.com/wordpress-mobile/gutenberg-mobile/ + WordPressAuthenticator: + :branch: develop + :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git Yoga: :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/d377b883c761c2a71d29bd631f3d3227b3e313a2/react-native-gutenberg-bridge/third-party-podspecs/Yoga.podspec.json @@ -620,6 +622,9 @@ CHECKOUT OPTIONS: RNTAztecView: :commit: d377b883c761c2a71d29bd631f3d3227b3e313a2 :git: https://github.com/wordpress-mobile/gutenberg-mobile/ + WordPressAuthenticator: + :commit: 21860953d676d165aa2e53e2f877071ef2b6e683 + :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git SPEC CHECKSUMS: 1PasswordExtension: 0e95bdea64ec8ff2f4f693be5467a09fac42a83d @@ -650,7 +655,7 @@ SPEC CHECKSUMS: MRProgress: 16de7cc9f347e8846797a770db102a323fe7ef09 Nimble: 051e3d8912d40138fa5591c78594f95fb172af37 NSObject-SafeExpectations: ab8fe623d36b25aa1f150affa324e40a2f3c0374 - "NSURL+IDN": 82355a0afd532fe1de08f6417c134b49b1a1c4b3 + "NSURL+IDN": afc873e639c18138a1589697c3add197fe8679ca OCMock: 43565190abc78977ad44a61c0d20d7f0784d35ab OHHTTPStubs: 1e21c7d2c084b8153fc53d48400d8919d2d432d0 RCTRequired: 3ca691422140f76f04fd2af6dc90914cf0f81ef1 @@ -689,7 +694,7 @@ SPEC CHECKSUMS: UIDeviceIdentifier: 44f805037d21b94394821828f4fcaba34b38c2d0 WordPress-Aztec-iOS: 64a2989d25befb5ce086fac440315f696026ffd5 WordPress-Editor-iOS: 63ef6a532af2c92e3301421f5c4af41ad3be8721 - WordPressAuthenticator: 6a397573be47bd9f054e79f5241095614c430f82 + WordPressAuthenticator: 670e5722a33771a78df31c6f4cb837a9c0113b90 WordPressKit: 1b4b330f8a5817eccd9b221690dc1151a4c0958e WordPressMocks: b4064b99a073117bbc304abe82df78f2fbe60992 WordPressShared: 02e0947034648cbd7251ffcc10f64d512f93a53b @@ -706,6 +711,6 @@ SPEC CHECKSUMS: ZendeskSupportSDK: a87ab1e4badace92c75eb11dc77ede1e995b2adc ZIPFoundation: 249fa8890597086cd536bb2df5c9804d84e122b0 -PODFILE CHECKSUM: ee0f220c085d23d34877b836cb55ff2374098dce +PODFILE CHECKSUM: a9e7e6468cbeaeb500b6a6430199647da42f0ec0 COCOAPODS: 1.8.4