From f03e23001038dab99a47d5e3f2bb93b1a08109a4 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Fri, 23 Feb 2024 13:06:14 +1100 Subject: [PATCH 1/2] Point to WIP WordPressKit version --- Podfile | 4 ++-- Podfile.lock | 13 +++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Podfile b/Podfile index 05f7dbecf38..fe56bb2fc29 100644 --- a/Podfile +++ b/Podfile @@ -90,8 +90,8 @@ target 'WooCommerce' do # pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', commit: '' # pod 'WordPressAuthenticator', path: '../WordPressAuthenticator-iOS' - pod 'WordPressKit', '~> 13.1' - # pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', commit: '' + # pod 'WordPressKit', '~> 13.1' + pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', commit: 'd6dce6de4277a7e2046fef76c71de570d2a8acd0' wordpress_shared diff --git a/Podfile.lock b/Podfile.lock index 26b61266d89..b5c5528113d 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -75,7 +75,7 @@ DEPENDENCIES: - WordPress-Aztec-iOS (from `https://github.com/wordpress-mobile/AztecEditor-iOS.git`, commit `950c7bc1bf98326986f10cccb2715ad86976f0fd`) - WordPress-Editor-iOS (from `https://github.com/wordpress-mobile/AztecEditor-iOS.git`, commit `950c7bc1bf98326986f10cccb2715ad86976f0fd`) - WordPressAuthenticator (~> 9.0) - - WordPressKit (~> 13.1) + - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `d6dce6de4277a7e2046fef76c71de570d2a8acd0`) - WordPressShared (~> 2.1) - WordPressUI (~> 1.15) - Wormholy (~> 1.6.6) @@ -85,7 +85,6 @@ DEPENDENCIES: SPEC REPOS: https://github.com/wordpress-mobile/cocoapods-specs.git: - WordPressAuthenticator - - WordPressKit trunk: - Alamofire - Automattic-Tracks-iOS @@ -123,6 +122,9 @@ EXTERNAL SOURCES: WordPress-Editor-iOS: :commit: 950c7bc1bf98326986f10cccb2715ad86976f0fd :git: https://github.com/wordpress-mobile/AztecEditor-iOS.git + WordPressKit: + :commit: d6dce6de4277a7e2046fef76c71de570d2a8acd0 + :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git CHECKOUT OPTIONS: WordPress-Aztec-iOS: @@ -131,6 +133,9 @@ CHECKOUT OPTIONS: WordPress-Editor-iOS: :commit: 950c7bc1bf98326986f10cccb2715ad86976f0fd :git: https://github.com/wordpress-mobile/AztecEditor-iOS.git + WordPressKit: + :commit: d6dce6de4277a7e2046fef76c71de570d2a8acd0 + :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git SPEC CHECKSUMS: Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844 @@ -152,7 +157,7 @@ SPEC CHECKSUMS: WordPress-Aztec-iOS: fbebd569c61baa252b3f5058c0a2a9a6ada686bb WordPress-Editor-iOS: bda9f7f942212589b890329a0cb22547311749ef WordPressAuthenticator: 0891ba77c788044d32fe67a4d0435fdd598cecbd - WordPressKit: 7189845e0325fc6022a02638b572e1de8c1d7cc6 + WordPressKit: c1ba7b4f531693a0914f676423808fdffd820d81 WordPressShared: 0aa459e5257a77184db87805a998f447443c9706 WordPressUI: 700e3ec5a9f77b6920c8104c338c85788036ab3c Wormholy: 09da0b876f9276031fd47383627cb75e194fc068 @@ -166,6 +171,6 @@ SPEC CHECKSUMS: ZendeskSupportProvidersSDK: 685b5d185af47ced0ec40564ec46355c838bbd06 ZendeskSupportSDK: 92e6f9d334e81e9186f8a17583862350460a5393 -PODFILE CHECKSUM: 296197a9c546e1c3e40c103704720a4b850f7ab1 +PODFILE CHECKSUM: bb170228ac8006fc64d32486656c5598fb94bad0 COCOAPODS: 1.14.0 From 55a95fd3ab9d8901521e63975c24d0dd4645ff55 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Fri, 23 Feb 2024 13:08:41 +1100 Subject: [PATCH 2/2] Point to WIP Authenticator version --- Podfile | 4 ++-- Podfile.lock | 14 +++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Podfile b/Podfile index fe56bb2fc29..046c00ddb07 100644 --- a/Podfile +++ b/Podfile @@ -85,9 +85,9 @@ target 'WooCommerce' do pod 'Gridicons', '~> 1.2.0' # To allow pod to pick up beta versions use -beta. E.g., 1.1.7-beta.1 - pod 'WordPressAuthenticator', '~> 9.0' + # pod 'WordPressAuthenticator', '~> 9.0' # pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', branch: '' - # pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', commit: '' + pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', commit: '493ec1fff78b3933ca8aeea7df7839146b2e73c9' # pod 'WordPressAuthenticator', path: '../WordPressAuthenticator-iOS' # pod 'WordPressKit', '~> 13.1' diff --git a/Podfile.lock b/Podfile.lock index b5c5528113d..54e01a6f3cb 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -74,7 +74,7 @@ DEPENDENCIES: - SwiftLint (~> 0.54) - WordPress-Aztec-iOS (from `https://github.com/wordpress-mobile/AztecEditor-iOS.git`, commit `950c7bc1bf98326986f10cccb2715ad86976f0fd`) - WordPress-Editor-iOS (from `https://github.com/wordpress-mobile/AztecEditor-iOS.git`, commit `950c7bc1bf98326986f10cccb2715ad86976f0fd`) - - WordPressAuthenticator (~> 9.0) + - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, commit `493ec1fff78b3933ca8aeea7df7839146b2e73c9`) - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `d6dce6de4277a7e2046fef76c71de570d2a8acd0`) - WordPressShared (~> 2.1) - WordPressUI (~> 1.15) @@ -83,8 +83,6 @@ DEPENDENCIES: - ZendeskSupportSDK (~> 6.0) SPEC REPOS: - https://github.com/wordpress-mobile/cocoapods-specs.git: - - WordPressAuthenticator trunk: - Alamofire - Automattic-Tracks-iOS @@ -122,6 +120,9 @@ EXTERNAL SOURCES: WordPress-Editor-iOS: :commit: 950c7bc1bf98326986f10cccb2715ad86976f0fd :git: https://github.com/wordpress-mobile/AztecEditor-iOS.git + WordPressAuthenticator: + :commit: 493ec1fff78b3933ca8aeea7df7839146b2e73c9 + :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git WordPressKit: :commit: d6dce6de4277a7e2046fef76c71de570d2a8acd0 :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git @@ -133,6 +134,9 @@ CHECKOUT OPTIONS: WordPress-Editor-iOS: :commit: 950c7bc1bf98326986f10cccb2715ad86976f0fd :git: https://github.com/wordpress-mobile/AztecEditor-iOS.git + WordPressAuthenticator: + :commit: 493ec1fff78b3933ca8aeea7df7839146b2e73c9 + :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git WordPressKit: :commit: d6dce6de4277a7e2046fef76c71de570d2a8acd0 :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git @@ -156,7 +160,7 @@ SPEC CHECKSUMS: UIDeviceIdentifier: 442b65b4ff1832d4ca9c2a157815cb29ad981b17 WordPress-Aztec-iOS: fbebd569c61baa252b3f5058c0a2a9a6ada686bb WordPress-Editor-iOS: bda9f7f942212589b890329a0cb22547311749ef - WordPressAuthenticator: 0891ba77c788044d32fe67a4d0435fdd598cecbd + WordPressAuthenticator: ba69878bfa1368636e92d29fcfb5bd1e0a11a3ef WordPressKit: c1ba7b4f531693a0914f676423808fdffd820d81 WordPressShared: 0aa459e5257a77184db87805a998f447443c9706 WordPressUI: 700e3ec5a9f77b6920c8104c338c85788036ab3c @@ -171,6 +175,6 @@ SPEC CHECKSUMS: ZendeskSupportProvidersSDK: 685b5d185af47ced0ec40564ec46355c838bbd06 ZendeskSupportSDK: 92e6f9d334e81e9186f8a17583862350460a5393 -PODFILE CHECKSUM: bb170228ac8006fc64d32486656c5598fb94bad0 +PODFILE CHECKSUM: b1f7e1aba39fe659ab28dd657a6762134cfb8812 COCOAPODS: 1.14.0