From d5c674fb63cad2a61f6dc950384c3a6c63b5b42a Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Mon, 13 Mar 2023 13:11:43 +0100 Subject: [PATCH 1/5] Bump WordPressKit dependency to 7.0-beta --- Podfile | 3 ++- Podfile.lock | 23 +++++++++++++++-------- WordPressAuthenticator.podspec | 4 ++-- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Podfile b/Podfile index 97235de5b..27ea0df4a 100644 --- a/Podfile +++ b/Podfile @@ -28,7 +28,8 @@ def wordpress_authenticator_pods ## pod 'Gridicons', '~> 1.0-beta' # Don't change this until we hit 2.0 in Gridicons pod 'WordPressUI', '~> 1.7-beta' # Don't change this until we hit 2.0 in WordPressUI - pod 'WordPressKit', '~> 6.0-beta' # Don't change this until we hit 5.0 in WPKit + # pod 'WordPressKit', '~> 7.0-beta' # Don't change this until we hit 8.0 in WPKit + pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', branch: 'add/media-videopress-token' pod 'WordPressShared', '~> 2.1-beta' third_party_pods diff --git a/Podfile.lock b/Podfile.lock index 52ef9cc6c..8b989c311 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -22,15 +22,15 @@ PODS: - SVProgressHUD (2.2.5) - SwiftLint (0.49.1) - UIDeviceIdentifier (2.2.0) - - WordPressAuthenticator (5.5.0): + - WordPressAuthenticator (5.6.0): - GoogleSignIn (~> 6.0.1) - Gridicons (~> 1.0) - "NSURL+IDN (= 0.4)" - SVProgressHUD (~> 2.2.5) - - WordPressKit (~> 6.0-beta) + - WordPressKit (~> 7.0-beta) - WordPressShared (~> 2.1-beta) - WordPressUI (~> 1.7-beta) - - WordPressKit (6.0.0-beta.1): + - WordPressKit (7.0.0-beta.1): - Alamofire (~> 4.8.0) - NSObject-SafeExpectations (~> 0.0.4) - UIDeviceIdentifier (~> 2.0) @@ -50,7 +50,7 @@ DEPENDENCIES: - SVProgressHUD (= 2.2.5) - SwiftLint (~> 0.49) - WordPressAuthenticator (from `.`) - - WordPressKit (~> 6.0-beta) + - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, branch `add/media-videopress-token`) - WordPressShared (~> 2.1-beta) - WordPressUI (~> 1.7-beta) @@ -70,7 +70,6 @@ SPEC REPOS: - SVProgressHUD - SwiftLint - UIDeviceIdentifier - - WordPressKit - WordPressShared - WordPressUI - wpxmlrpc @@ -78,6 +77,14 @@ SPEC REPOS: EXTERNAL SOURCES: WordPressAuthenticator: :path: "." + WordPressKit: + :branch: add/media-videopress-token + :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git + +CHECKOUT OPTIONS: + WordPressKit: + :commit: 7946aa5616737c2fac6be14d843419a2f01afba8 + :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git SPEC CHECKSUMS: Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3 @@ -94,12 +101,12 @@ SPEC CHECKSUMS: SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6 SwiftLint: 32ee33ded0636d0905ef6911b2b67bbaeeedafa5 UIDeviceIdentifier: f33af270ba9045ea18b31d9aab88e42a0082ea67 - WordPressAuthenticator: 0620a9f3a367af505d9bc946975184a73906e2e5 - WordPressKit: 08da0bc981f6398ef7a32e523fd054de7d7c7069 + WordPressAuthenticator: 345994ee66093283ccca7e2c279c87957d9a1ec8 + WordPressKit: d5bff8713aa7c0092ff6e2a58623e46a99fc897c WordPressShared: 0aa459e5257a77184db87805a998f447443c9706 WordPressUI: 1cf47a3b78154faf69caa18569ee7ece1e510fa0 wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd -PODFILE CHECKSUM: 8746ca27deaec1c319801f91d81dab582ee1c0f5 +PODFILE CHECKSUM: 713d21ace7d1e7464704514af139dd8d76f3fcf0 COCOAPODS: 1.11.3 diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index 73ff1a185..7e516740f 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -2,7 +2,7 @@ Pod::Spec.new do |s| s.name = 'WordPressAuthenticator' - s.version = '5.5.0' + s.version = '5.6.0' s.summary = 'WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps.' s.description = <<-DESC @@ -41,6 +41,6 @@ Pod::Spec.new do |s| # Use a loose restriction that allows both production and beta versions, up to the next major version. # If you want to update which of these is used, specify it in the host app. s.dependency 'WordPressUI', '~> 1.7-beta' - s.dependency 'WordPressKit', '~> 6.0-beta' + s.dependency 'WordPressKit', '~> 7.0-beta' s.dependency 'WordPressShared', '~> 2.1-beta' end From e98a2d3c4eff3472dd18b29b8dc49e4a92698681 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Mon, 13 Mar 2023 13:11:57 +0100 Subject: [PATCH 2/5] Update CHANGELOG --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f25db66cd..f9f5d04f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,12 @@ _None._ _None._ +## 5.6.0 + +### Internal Changes + +- Change minimum version of WordPressKit to 7.0. + ## 5.5.0 ### New Features From 7eebe085b7a544e7091037c39974d606076dfe6d Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 17 Mar 2023 13:54:39 +0100 Subject: [PATCH 3/5] Set `WordPressKit` minimum version to `7.0` --- Podfile | 3 +-- Podfile.lock | 13 +++---------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Podfile b/Podfile index 27ea0df4a..eb3bb33b3 100644 --- a/Podfile +++ b/Podfile @@ -28,8 +28,7 @@ def wordpress_authenticator_pods ## pod 'Gridicons', '~> 1.0-beta' # Don't change this until we hit 2.0 in Gridicons pod 'WordPressUI', '~> 1.7-beta' # Don't change this until we hit 2.0 in WordPressUI - # pod 'WordPressKit', '~> 7.0-beta' # Don't change this until we hit 8.0 in WPKit - pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', branch: 'add/media-videopress-token' + pod 'WordPressKit', '~> 7.0-beta' # Don't change this until we hit 8.0 in WPKit pod 'WordPressShared', '~> 2.1-beta' third_party_pods diff --git a/Podfile.lock b/Podfile.lock index 8b989c311..a2000d0ee 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -50,7 +50,7 @@ DEPENDENCIES: - SVProgressHUD (= 2.2.5) - SwiftLint (~> 0.49) - WordPressAuthenticator (from `.`) - - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, branch `add/media-videopress-token`) + - WordPressKit (~> 7.0-beta) - WordPressShared (~> 2.1-beta) - WordPressUI (~> 1.7-beta) @@ -70,6 +70,7 @@ SPEC REPOS: - SVProgressHUD - SwiftLint - UIDeviceIdentifier + - WordPressKit - WordPressShared - WordPressUI - wpxmlrpc @@ -77,14 +78,6 @@ SPEC REPOS: EXTERNAL SOURCES: WordPressAuthenticator: :path: "." - WordPressKit: - :branch: add/media-videopress-token - :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git - -CHECKOUT OPTIONS: - WordPressKit: - :commit: 7946aa5616737c2fac6be14d843419a2f01afba8 - :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git SPEC CHECKSUMS: Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3 @@ -107,6 +100,6 @@ SPEC CHECKSUMS: WordPressUI: 1cf47a3b78154faf69caa18569ee7ece1e510fa0 wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd -PODFILE CHECKSUM: 713d21ace7d1e7464704514af139dd8d76f3fcf0 +PODFILE CHECKSUM: 7c35f7d30c7c7864a85d92a354a22ddcb8f087df COCOAPODS: 1.11.3 From f0d3ea5dd4dc06c3a53260fb37b714b361b1a8bf Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 17 Mar 2023 14:02:35 +0100 Subject: [PATCH 4/5] Change podspec version to `5.6.0-beta.1` --- Podfile.lock | 4 ++-- WordPressAuthenticator.podspec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index a2000d0ee..8db209ac5 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -22,7 +22,7 @@ PODS: - SVProgressHUD (2.2.5) - SwiftLint (0.49.1) - UIDeviceIdentifier (2.2.0) - - WordPressAuthenticator (5.6.0): + - WordPressAuthenticator (5.6.0-beta.1): - GoogleSignIn (~> 6.0.1) - Gridicons (~> 1.0) - "NSURL+IDN (= 0.4)" @@ -94,7 +94,7 @@ SPEC CHECKSUMS: SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6 SwiftLint: 32ee33ded0636d0905ef6911b2b67bbaeeedafa5 UIDeviceIdentifier: f33af270ba9045ea18b31d9aab88e42a0082ea67 - WordPressAuthenticator: 345994ee66093283ccca7e2c279c87957d9a1ec8 + WordPressAuthenticator: 05297f67b2f8b3cc1758ff006cfe93109ccddd40 WordPressKit: d5bff8713aa7c0092ff6e2a58623e46a99fc897c WordPressShared: 0aa459e5257a77184db87805a998f447443c9706 WordPressUI: 1cf47a3b78154faf69caa18569ee7ece1e510fa0 diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index 7e516740f..ab2699dfc 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -2,7 +2,7 @@ Pod::Spec.new do |s| s.name = 'WordPressAuthenticator' - s.version = '5.6.0' + s.version = '5.6.0-beta.1' s.summary = 'WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps.' s.description = <<-DESC From 57cbe6711a8b4714f4883ea945728f40c9f99cb6 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 17 Mar 2023 14:03:57 +0100 Subject: [PATCH 5/5] Update changelog --- CHANGELOG.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9f5d04f9..96589e273 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,13 +46,7 @@ _None._ ### Internal Changes -_None._ - -## 5.6.0 - -### Internal Changes - -- Change minimum version of WordPressKit to 7.0. +- Change minimum version of WordPressKit to 7.0 [#754] ## 5.5.0