From dba574e630309ebb1f303dd5a9ebcaeeb94033f5 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Tue, 27 Feb 2024 17:38:25 +0000 Subject: [PATCH 1/4] chore: Update reference to WordPressShared branch --- Podfile | 4 ++-- Podfile.lock | 13 +++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Podfile b/Podfile index 8e0045a80e10..b617d17a8266 100644 --- a/Podfile +++ b/Podfile @@ -23,9 +23,9 @@ workspace 'WordPress.xcworkspace' ## =================================== ## def wordpress_shared - pod 'WordPressShared', '~> 2.3' + # pod 'WordPressShared', '~> 2.3' # pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', tag: '' - # pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', branch: 'trunk' + pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', branch: 'gutenberg/remove-videopress-ref-from-excerpt' # pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', commit: '' # pod 'WordPressShared', path: '../WordPress-iOS-Shared' end diff --git a/Podfile.lock b/Podfile.lock index cb5d75718f9a..d1dbd1fabdda 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -121,7 +121,7 @@ DEPENDENCIES: - WordPress-Editor-iOS (~> 1.19.9) - WordPressAuthenticator (>= 9.0.1, ~> 9.0) - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `f335202c98b972dd2a426dfe0e06780a38579ee7`) - - WordPressShared (~> 2.3) + - WordPressShared (from `https://github.com/wordpress-mobile/WordPress-iOS-Shared.git`, branch `gutenberg/remove-videopress-ref-from-excerpt`) - WordPressUI (~> 1.15) - ZendeskSupportSDK (= 5.3.0) - ZIPFoundation (~> 0.9.8) @@ -129,7 +129,6 @@ DEPENDENCIES: SPEC REPOS: https://github.com/wordpress-mobile/cocoapods-specs.git: - WordPressAuthenticator - - WordPressShared trunk: - Alamofire - AlamofireImage @@ -178,6 +177,9 @@ EXTERNAL SOURCES: WordPressKit: :commit: f335202c98b972dd2a426dfe0e06780a38579ee7 :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git + WordPressShared: + :branch: gutenberg/remove-videopress-ref-from-excerpt + :git: https://github.com/wordpress-mobile/WordPress-iOS-Shared.git CHECKOUT OPTIONS: FSInteractiveMap: @@ -186,6 +188,9 @@ CHECKOUT OPTIONS: WordPressKit: :commit: f335202c98b972dd2a426dfe0e06780a38579ee7 :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git + WordPressShared: + :commit: 586a6be30dbf1a66de2c5a992e91274f46140c29 + :git: https://github.com/wordpress-mobile/WordPress-iOS-Shared.git SPEC CHECKSUMS: Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3 @@ -219,7 +224,7 @@ SPEC CHECKSUMS: WordPress-Editor-iOS: bda9f7f942212589b890329a0cb22547311749ef WordPressAuthenticator: 0891ba77c788044d32fe67a4d0435fdd598cecbd WordPressKit: c1ba7b4f531693a0914f676423808fdffd820d81 - WordPressShared: cad7777b283d3ce2752f283df587342a581cd49b + WordPressShared: f99faa127509b666d2f8b931989a900e2fd9d10d WordPressUI: a491454affda3b0fb812812e637dc5e8f8f6bd06 wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd ZendeskCommonUISDK: 5f0a83f412e07ae23701f18c412fe783b3249ef5 @@ -231,6 +236,6 @@ SPEC CHECKSUMS: ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced -PODFILE CHECKSUM: 4453062b0c973ec7e780bff098a5b1e78639736c +PODFILE CHECKSUM: 01bda59d123e66440f18a9e032be4302f94ac39a COCOAPODS: 1.14.2 From 643b4615add53562e65092f9be26c228d43b56bc Mon Sep 17 00:00:00 2001 From: Siobhan Date: Fri, 1 Mar 2024 11:50:03 +0000 Subject: [PATCH 2/4] chore: Update WordPressShared ref --- Podfile | 4 ++-- Podfile.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Podfile b/Podfile index b617d17a8266..754892827e09 100644 --- a/Podfile +++ b/Podfile @@ -25,8 +25,8 @@ workspace 'WordPress.xcworkspace' def wordpress_shared # pod 'WordPressShared', '~> 2.3' # pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', tag: '' - pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', branch: 'gutenberg/remove-videopress-ref-from-excerpt' - # pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', commit: '' + # pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', branch: 'trunk' + pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', commit: '0a14bc96e22f097eca99eeccf37b5de11fa62612' # pod 'WordPressShared', path: '../WordPress-iOS-Shared' end diff --git a/Podfile.lock b/Podfile.lock index d1dbd1fabdda..2fd66174ce0f 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -121,7 +121,7 @@ DEPENDENCIES: - WordPress-Editor-iOS (~> 1.19.9) - WordPressAuthenticator (>= 9.0.1, ~> 9.0) - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `f335202c98b972dd2a426dfe0e06780a38579ee7`) - - WordPressShared (from `https://github.com/wordpress-mobile/WordPress-iOS-Shared.git`, branch `gutenberg/remove-videopress-ref-from-excerpt`) + - WordPressShared (from `https://github.com/wordpress-mobile/WordPress-iOS-Shared.git`, commit `0a14bc96e22f097eca99eeccf37b5de11fa62612`) - WordPressUI (~> 1.15) - ZendeskSupportSDK (= 5.3.0) - ZIPFoundation (~> 0.9.8) @@ -178,7 +178,7 @@ EXTERNAL SOURCES: :commit: f335202c98b972dd2a426dfe0e06780a38579ee7 :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git WordPressShared: - :branch: gutenberg/remove-videopress-ref-from-excerpt + :commit: 0a14bc96e22f097eca99eeccf37b5de11fa62612 :git: https://github.com/wordpress-mobile/WordPress-iOS-Shared.git CHECKOUT OPTIONS: @@ -189,7 +189,7 @@ CHECKOUT OPTIONS: :commit: f335202c98b972dd2a426dfe0e06780a38579ee7 :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git WordPressShared: - :commit: 586a6be30dbf1a66de2c5a992e91274f46140c29 + :commit: 0a14bc96e22f097eca99eeccf37b5de11fa62612 :git: https://github.com/wordpress-mobile/WordPress-iOS-Shared.git SPEC CHECKSUMS: @@ -236,6 +236,6 @@ SPEC CHECKSUMS: ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced -PODFILE CHECKSUM: 01bda59d123e66440f18a9e032be4302f94ac39a +PODFILE CHECKSUM: 3caf096700b56a0d4beec7a4c43846dba74ce1e2 COCOAPODS: 1.14.2 From cf69345f7b875272eeb902192f23af0c97fc4245 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Fri, 1 Mar 2024 12:11:31 +0000 Subject: [PATCH 3/4] chore: Fix reference in Podfile.lock --- Podfile.lock | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index fcbfdaebeeaf..9f63dfef1e95 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -118,8 +118,8 @@ DEPENDENCIES: - SVProgressHUD (= 2.2.5) - SwiftLint (= 0.54.0) - WordPress-Editor-iOS (~> 1.19.9) - - WordPressAuthenticator (>= 9.0.1, ~> 9.0) - - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `f335202c98b972dd2a426dfe0e06780a38579ee7`) + - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, commit `000cbf2b3b1644b224eb46f14f1cfc609103f686`) + - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `40d6a9f4928b470d73a5ade7ff1842a29e80cef8`) - WordPressShared (from `https://github.com/wordpress-mobile/WordPress-iOS-Shared.git`, commit `0a14bc96e22f097eca99eeccf37b5de11fa62612`) - WordPressUI (~> 1.15) - ZendeskSupportSDK (= 5.3.0) @@ -127,7 +127,6 @@ DEPENDENCIES: SPEC REPOS: https://github.com/wordpress-mobile/cocoapods-specs.git: - - WordPressAuthenticator - WordPressShared trunk: - Alamofire @@ -230,7 +229,7 @@ SPEC CHECKSUMS: WordPress-Editor-iOS: bda9f7f942212589b890329a0cb22547311749ef WordPressAuthenticator: ba69878bfa1368636e92d29fcfb5bd1e0a11a3ef WordPressKit: f446e322a67949d760629ed430589975ca5b9d71 - WordPressShared: cad7777b283d3ce2752f283df587342a581cd49b + WordPressShared: f99faa127509b666d2f8b931989a900e2fd9d10d WordPressUI: a491454affda3b0fb812812e637dc5e8f8f6bd06 wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd ZendeskCommonUISDK: 5f0a83f412e07ae23701f18c412fe783b3249ef5 @@ -242,6 +241,6 @@ SPEC CHECKSUMS: ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced -PODFILE CHECKSUM: a5f578243c785e0c38eb87f15a7c1063db575bee +PODFILE CHECKSUM: 70c703d9dea1af3e9a7d9dd82484925dcab05711 COCOAPODS: 1.14.2 From 58dbc15b3be11a640c6bd56c4709532794dd2651 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Fri, 1 Mar 2024 12:16:24 +0000 Subject: [PATCH 4/4] chore: Update after `bundle exec pod install` --- Podfile.lock | 2 -- 1 file changed, 2 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 9f63dfef1e95..43db48d9eca4 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -126,8 +126,6 @@ DEPENDENCIES: - ZIPFoundation (~> 0.9.8) SPEC REPOS: - https://github.com/wordpress-mobile/cocoapods-specs.git: - - WordPressShared trunk: - Alamofire - AlamofireImage