From 7e4bed9c5ef2c13848a6938623b054c0aa55c684 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Tue, 13 Feb 2024 22:04:22 +0000 Subject: [PATCH 01/14] Update Gutenberg Mobile reference --- Gutenberg/config.yml | 2 +- Podfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gutenberg/config.yml b/Gutenberg/config.yml index d7d70cc49036..6e4764b43cb8 100644 --- a/Gutenberg/config.yml +++ b/Gutenberg/config.yml @@ -9,6 +9,6 @@ # # LOCAL_GUTENBERG=../my-gutenberg-fork bundle exec pod install ref: - tag: v1.112.0 + commit: b0278b6b5a90f03b54bb3af52645570b72d87290 github_org: wordpress-mobile repo_name: gutenberg-mobile diff --git a/Podfile.lock b/Podfile.lock index 8aa018c2ed77..4effa290fa04 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -106,7 +106,7 @@ DEPENDENCIES: - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`) - Gifu (= 3.3.1) - Gridicons (~> 1.2) - - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.112.0.podspec`) + - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-b0278b6b5a90f03b54bb3af52645570b72d87290.podspec`) - JTAppleCalendar (~> 8.0.5) - Kanvas (~> 1.4.4) - MediaEditor (>= 1.2.2, ~> 1.2) @@ -173,7 +173,7 @@ EXTERNAL SOURCES: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 Gutenberg: - :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.112.0.podspec + :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-b0278b6b5a90f03b54bb3af52645570b72d87290.podspec WordPressAuthenticator: :commit: fa06fca7178b268d382d91861752b3be0729e8a8 :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git @@ -204,7 +204,7 @@ SPEC CHECKSUMS: FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86 Gifu: 416d4e38c4c2fed012f019e0a1d3ffcb58e5b842 Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d - Gutenberg: ba97dd36571958f64108233a692e6057f5010dc2 + Gutenberg: 00ce90f2cfd65786bfedcce88446d5942cf0510b JTAppleCalendar: 16c6501b22cb27520372c28b0a2e0b12c8d0cd73 Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08 MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae From ccc4615ed2293e0871fea33817b0aa07411cd1e1 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Wed, 14 Feb 2024 09:33:37 +0000 Subject: [PATCH 02/14] Update Gutenberg Mobile reference --- Gutenberg/config.yml | 2 +- Podfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gutenberg/config.yml b/Gutenberg/config.yml index 6e4764b43cb8..0e6e10548891 100644 --- a/Gutenberg/config.yml +++ b/Gutenberg/config.yml @@ -9,6 +9,6 @@ # # LOCAL_GUTENBERG=../my-gutenberg-fork bundle exec pod install ref: - commit: b0278b6b5a90f03b54bb3af52645570b72d87290 + commit: 37609f013ee27af3bc453507d041b7eb71d6c131 github_org: wordpress-mobile repo_name: gutenberg-mobile diff --git a/Podfile.lock b/Podfile.lock index 4effa290fa04..d70f6842fbef 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -106,7 +106,7 @@ DEPENDENCIES: - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`) - Gifu (= 3.3.1) - Gridicons (~> 1.2) - - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-b0278b6b5a90f03b54bb3af52645570b72d87290.podspec`) + - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-37609f013ee27af3bc453507d041b7eb71d6c131.podspec`) - JTAppleCalendar (~> 8.0.5) - Kanvas (~> 1.4.4) - MediaEditor (>= 1.2.2, ~> 1.2) @@ -173,7 +173,7 @@ EXTERNAL SOURCES: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 Gutenberg: - :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-b0278b6b5a90f03b54bb3af52645570b72d87290.podspec + :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-37609f013ee27af3bc453507d041b7eb71d6c131.podspec WordPressAuthenticator: :commit: fa06fca7178b268d382d91861752b3be0729e8a8 :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git @@ -204,7 +204,7 @@ SPEC CHECKSUMS: FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86 Gifu: 416d4e38c4c2fed012f019e0a1d3ffcb58e5b842 Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d - Gutenberg: 00ce90f2cfd65786bfedcce88446d5942cf0510b + Gutenberg: 9b6e933a96f6ffeaa4f0878b0fcc59a191ff8af3 JTAppleCalendar: 16c6501b22cb27520372c28b0a2e0b12c8d0cd73 Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08 MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae From acf76f7f01bc4acc51df3847e018544ea84117cd Mon Sep 17 00:00:00 2001 From: Siobhan Date: Wed, 14 Feb 2024 15:41:39 +0000 Subject: [PATCH 03/14] Update Gutenberg Mobile reference --- Gutenberg/config.yml | 2 +- Podfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gutenberg/config.yml b/Gutenberg/config.yml index 0e6e10548891..1dae6d4da6b1 100644 --- a/Gutenberg/config.yml +++ b/Gutenberg/config.yml @@ -9,6 +9,6 @@ # # LOCAL_GUTENBERG=../my-gutenberg-fork bundle exec pod install ref: - commit: 37609f013ee27af3bc453507d041b7eb71d6c131 + commit: 9485b3bea406f001669cc820d07eb6bb6060a333 github_org: wordpress-mobile repo_name: gutenberg-mobile diff --git a/Podfile.lock b/Podfile.lock index d70f6842fbef..34d0046830b2 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -106,7 +106,7 @@ DEPENDENCIES: - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`) - Gifu (= 3.3.1) - Gridicons (~> 1.2) - - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-37609f013ee27af3bc453507d041b7eb71d6c131.podspec`) + - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-9485b3bea406f001669cc820d07eb6bb6060a333.podspec`) - JTAppleCalendar (~> 8.0.5) - Kanvas (~> 1.4.4) - MediaEditor (>= 1.2.2, ~> 1.2) @@ -173,7 +173,7 @@ EXTERNAL SOURCES: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 Gutenberg: - :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-37609f013ee27af3bc453507d041b7eb71d6c131.podspec + :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-9485b3bea406f001669cc820d07eb6bb6060a333.podspec WordPressAuthenticator: :commit: fa06fca7178b268d382d91861752b3be0729e8a8 :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git @@ -204,7 +204,7 @@ SPEC CHECKSUMS: FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86 Gifu: 416d4e38c4c2fed012f019e0a1d3ffcb58e5b842 Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d - Gutenberg: 9b6e933a96f6ffeaa4f0878b0fcc59a191ff8af3 + Gutenberg: 7452baebf7d25b4c2979c9a3a82ea21fb7b57314 JTAppleCalendar: 16c6501b22cb27520372c28b0a2e0b12c8d0cd73 Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08 MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae From 7b322a1237865dfd5e7b788e2c6ccdb4f371c3aa Mon Sep 17 00:00:00 2001 From: Siobhan Date: Fri, 16 Feb 2024 14:47:01 +0000 Subject: [PATCH 04/14] Update Gutenberg Mobile reference --- Gutenberg/config.yml | 2 +- Podfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gutenberg/config.yml b/Gutenberg/config.yml index 1dae6d4da6b1..b05b38e7d4f3 100644 --- a/Gutenberg/config.yml +++ b/Gutenberg/config.yml @@ -9,6 +9,6 @@ # # LOCAL_GUTENBERG=../my-gutenberg-fork bundle exec pod install ref: - commit: 9485b3bea406f001669cc820d07eb6bb6060a333 + commit: a837182584d41f46fdfebd4f1648090fcfa7b459 github_org: wordpress-mobile repo_name: gutenberg-mobile diff --git a/Podfile.lock b/Podfile.lock index 34d0046830b2..69ad0890ddae 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -106,7 +106,7 @@ DEPENDENCIES: - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`) - Gifu (= 3.3.1) - Gridicons (~> 1.2) - - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-9485b3bea406f001669cc820d07eb6bb6060a333.podspec`) + - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-a837182584d41f46fdfebd4f1648090fcfa7b459.podspec`) - JTAppleCalendar (~> 8.0.5) - Kanvas (~> 1.4.4) - MediaEditor (>= 1.2.2, ~> 1.2) @@ -173,7 +173,7 @@ EXTERNAL SOURCES: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 Gutenberg: - :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-9485b3bea406f001669cc820d07eb6bb6060a333.podspec + :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-a837182584d41f46fdfebd4f1648090fcfa7b459.podspec WordPressAuthenticator: :commit: fa06fca7178b268d382d91861752b3be0729e8a8 :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git @@ -204,7 +204,7 @@ SPEC CHECKSUMS: FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86 Gifu: 416d4e38c4c2fed012f019e0a1d3ffcb58e5b842 Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d - Gutenberg: 7452baebf7d25b4c2979c9a3a82ea21fb7b57314 + Gutenberg: 39c34117619c790c278d33d9e77aed77566919c6 JTAppleCalendar: 16c6501b22cb27520372c28b0a2e0b12c8d0cd73 Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08 MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae From b671b7d92782e33380096ed75d5cf629047e51c6 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Sat, 17 Feb 2024 14:03:59 +0000 Subject: [PATCH 05/14] Update Gutenberg Mobile reference --- Gutenberg/config.yml | 2 +- Podfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gutenberg/config.yml b/Gutenberg/config.yml index b05b38e7d4f3..010a6cc00bd4 100644 --- a/Gutenberg/config.yml +++ b/Gutenberg/config.yml @@ -9,6 +9,6 @@ # # LOCAL_GUTENBERG=../my-gutenberg-fork bundle exec pod install ref: - commit: a837182584d41f46fdfebd4f1648090fcfa7b459 + commit: c5e59b2b00de3488e7d3a1f39fc1638b10c1e73a github_org: wordpress-mobile repo_name: gutenberg-mobile diff --git a/Podfile.lock b/Podfile.lock index 69ad0890ddae..03f4c520c380 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -106,7 +106,7 @@ DEPENDENCIES: - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`) - Gifu (= 3.3.1) - Gridicons (~> 1.2) - - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-a837182584d41f46fdfebd4f1648090fcfa7b459.podspec`) + - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-c5e59b2b00de3488e7d3a1f39fc1638b10c1e73a.podspec`) - JTAppleCalendar (~> 8.0.5) - Kanvas (~> 1.4.4) - MediaEditor (>= 1.2.2, ~> 1.2) @@ -173,7 +173,7 @@ EXTERNAL SOURCES: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 Gutenberg: - :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-a837182584d41f46fdfebd4f1648090fcfa7b459.podspec + :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-c5e59b2b00de3488e7d3a1f39fc1638b10c1e73a.podspec WordPressAuthenticator: :commit: fa06fca7178b268d382d91861752b3be0729e8a8 :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git @@ -204,7 +204,7 @@ SPEC CHECKSUMS: FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86 Gifu: 416d4e38c4c2fed012f019e0a1d3ffcb58e5b842 Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d - Gutenberg: 39c34117619c790c278d33d9e77aed77566919c6 + Gutenberg: a4138274766cd4a46aa725965174d3403554302b JTAppleCalendar: 16c6501b22cb27520372c28b0a2e0b12c8d0cd73 Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08 MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae From ed159bedeafb52ae5e663c394522c5fc3626ef16 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Sat, 17 Feb 2024 16:31:48 +0000 Subject: [PATCH 06/14] feat: Enable VideoPress v5 capability --- WordPress/Classes/Models/Blog.h | 2 ++ WordPress/Classes/Models/Blog.m | 7 +++++++ .../ViewRelated/Gutenberg/GutenbergViewController.swift | 3 +++ 3 files changed, 12 insertions(+) diff --git a/WordPress/Classes/Models/Blog.h b/WordPress/Classes/Models/Blog.h index f651d93b67bc..30600983e27d 100644 --- a/WordPress/Classes/Models/Blog.h +++ b/WordPress/Classes/Models/Blog.h @@ -93,6 +93,8 @@ typedef NS_ENUM(NSUInteger, BlogFeature) { BlogFeatureTiledGallery, /// Does the blog support the VideoPress block? BlogFeatureVideoPress, + /// Does the blog support v5 of the VideoPress block? + BlogFeatureVideoPressV5, /// Does the blog support Facebook embed block? BlogFeatureFacebookEmbed, /// Does the blog support Instagram embed block? diff --git a/WordPress/Classes/Models/Blog.m b/WordPress/Classes/Models/Blog.m index a78d7c196428..f31d817fab67 100644 --- a/WordPress/Classes/Models/Blog.m +++ b/WordPress/Classes/Models/Blog.m @@ -607,6 +607,8 @@ - (BOOL)supports:(BlogFeature)feature return [self supportsTiledGallery]; case BlogFeatureVideoPress: return [self supportsVideoPress]; + case BlogFeatureVideoPressV5: + return [self supportsVideoPressV5]; case BlogFeatureFacebookEmbed: return [self supportsEmbedVariation: @"9.0"]; case BlogFeatureInstagramEmbed: @@ -733,6 +735,11 @@ - (BOOL)supportsVideoPress return self.isHostedAtWPcom; } +- (BOOL)supportsVideoPressV5 +{ + return self.isHostedAtWPcom || self.isAtomic; +} + - (BOOL)supportsEmbedVariation:(NSString *)requiredJetpackVersion { return [self hasRequiredJetpackVersion:requiredJetpackVersion] || self.isHostedAtWPcom; diff --git a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift index 6b6192b66b43..80105a59fda8 100644 --- a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift +++ b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift @@ -1227,6 +1227,7 @@ extension GutenbergViewController: GutenbergBridgeDataSource { .layoutGridBlock: false, .tiledGalleryBlock: false, .videoPressBlock: false, + .videoPressV5Support: false, .unsupportedBlockEditor: false, .canEnableUnsupportedBlockEditor: false, .isAudioBlockMediaUploadEnabled: !isFreeWPCom, @@ -1248,6 +1249,8 @@ extension GutenbergViewController: GutenbergBridgeDataSource { .layoutGridBlock: post.blog.supports(.layoutGrid), .tiledGalleryBlock: post.blog.supports(.tiledGallery), .videoPressBlock: post.blog.supports(.videoPress), + .videoPressV5Support: + post.blog.supports(.videoPressV5), .unsupportedBlockEditor: isUnsupportedBlockEditorEnabled, .canEnableUnsupportedBlockEditor: post.blog.jetpack?.isConnected ?? false, .isAudioBlockMediaUploadEnabled: !isFreeWPCom, From 74718a4d98c29f1f900a649c929a8dadb0c0d5e3 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Sat, 17 Feb 2024 17:52:12 +0000 Subject: [PATCH 07/14] Update Gutenberg Mobile reference --- Gutenberg/config.yml | 2 +- Podfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gutenberg/config.yml b/Gutenberg/config.yml index 010a6cc00bd4..1e2fa4d4b415 100644 --- a/Gutenberg/config.yml +++ b/Gutenberg/config.yml @@ -9,6 +9,6 @@ # # LOCAL_GUTENBERG=../my-gutenberg-fork bundle exec pod install ref: - commit: c5e59b2b00de3488e7d3a1f39fc1638b10c1e73a + commit: 897f363e6c8c7d81bc7c33dd140b787c6411946a github_org: wordpress-mobile repo_name: gutenberg-mobile diff --git a/Podfile.lock b/Podfile.lock index 03f4c520c380..91eedfa7b42d 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -106,7 +106,7 @@ DEPENDENCIES: - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`) - Gifu (= 3.3.1) - Gridicons (~> 1.2) - - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-c5e59b2b00de3488e7d3a1f39fc1638b10c1e73a.podspec`) + - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-897f363e6c8c7d81bc7c33dd140b787c6411946a.podspec`) - JTAppleCalendar (~> 8.0.5) - Kanvas (~> 1.4.4) - MediaEditor (>= 1.2.2, ~> 1.2) @@ -173,7 +173,7 @@ EXTERNAL SOURCES: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 Gutenberg: - :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-c5e59b2b00de3488e7d3a1f39fc1638b10c1e73a.podspec + :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-897f363e6c8c7d81bc7c33dd140b787c6411946a.podspec WordPressAuthenticator: :commit: fa06fca7178b268d382d91861752b3be0729e8a8 :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git @@ -204,7 +204,7 @@ SPEC CHECKSUMS: FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86 Gifu: 416d4e38c4c2fed012f019e0a1d3ffcb58e5b842 Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d - Gutenberg: a4138274766cd4a46aa725965174d3403554302b + Gutenberg: d873c23fa05f4509c8cf17f8bd49808d3aee4f16 JTAppleCalendar: 16c6501b22cb27520372c28b0a2e0b12c8d0cd73 Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08 MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae From 560e4626d929956b6845ded69fbe9b6e952413d2 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Mon, 19 Feb 2024 15:47:06 +0000 Subject: [PATCH 08/14] fix: Limit v5 to sites with VideoPress enabled --- WordPress/Classes/Models/Blog.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/Classes/Models/Blog.m b/WordPress/Classes/Models/Blog.m index f31d817fab67..a25ca8af2fef 100644 --- a/WordPress/Classes/Models/Blog.m +++ b/WordPress/Classes/Models/Blog.m @@ -737,7 +737,7 @@ - (BOOL)supportsVideoPress - (BOOL)supportsVideoPressV5 { - return self.isHostedAtWPcom || self.isAtomic; + return self.isHostedAtWPcom || (self.isAtomic && [self videoPressEnabled]); } - (BOOL)supportsEmbedVariation:(NSString *)requiredJetpackVersion From 92737484788d4da3ab77021bc2a82f5196edcbe7 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Wed, 21 Feb 2024 00:14:45 +0000 Subject: [PATCH 09/14] Update RELEASE-NOTES --- RELEASE-NOTES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 25b2061e71e2..4f75659cef4e 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,6 +1,6 @@ 24.3 ----- - +* [**] Block editor: Introduce VideoPress v5 support, to fix issues using video block with dotcom and Jetpack sites [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6634] 24.2 ----- From a1bf687473118184fb8e0b428f11a6874301d589 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Wed, 21 Feb 2024 00:20:47 +0000 Subject: [PATCH 10/14] Expand site types that support VideoPress v5 --- WordPress/Classes/Models/Blog.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/Classes/Models/Blog.m b/WordPress/Classes/Models/Blog.m index a25ca8af2fef..e8e24e1cac90 100644 --- a/WordPress/Classes/Models/Blog.m +++ b/WordPress/Classes/Models/Blog.m @@ -737,7 +737,7 @@ - (BOOL)supportsVideoPress - (BOOL)supportsVideoPressV5 { - return self.isHostedAtWPcom || (self.isAtomic && [self videoPressEnabled]); + return self.isHostedAtWPcom || self.isAtomic || [self hasRequiredJetpackVersion:@"8.5"]; } - (BOOL)supportsEmbedVariation:(NSString *)requiredJetpackVersion From 1625ef47424e39de51ca66704ae2ee33c9c3c8f8 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Wed, 21 Feb 2024 00:27:56 +0000 Subject: [PATCH 11/14] Update Gutenberg Mobile reference --- Gutenberg/config.yml | 2 +- Podfile.lock | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Gutenberg/config.yml b/Gutenberg/config.yml index 1e2fa4d4b415..524edcc077e2 100644 --- a/Gutenberg/config.yml +++ b/Gutenberg/config.yml @@ -9,6 +9,6 @@ # # LOCAL_GUTENBERG=../my-gutenberg-fork bundle exec pod install ref: - commit: 897f363e6c8c7d81bc7c33dd140b787c6411946a + commit: e4abec201fc3d79d32d28752e2477413be787659 github_org: wordpress-mobile repo_name: gutenberg-mobile diff --git a/Podfile.lock b/Podfile.lock index 972a5320bdf9..4f76627841b7 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -106,7 +106,7 @@ DEPENDENCIES: - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`) - Gifu (= 3.3.1) - Gridicons (~> 1.2) - - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-897f363e6c8c7d81bc7c33dd140b787c6411946a.podspec`) + - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-e4abec201fc3d79d32d28752e2477413be787659.podspec`) - JTAppleCalendar (~> 8.0.5) - Kanvas (~> 1.4.4) - MediaEditor (>= 1.2.2, ~> 1.2) @@ -129,7 +129,6 @@ DEPENDENCIES: SPEC REPOS: https://github.com/wordpress-mobile/cocoapods-specs.git: - WordPressAuthenticator - - WordPressKit - WordPressShared trunk: - Alamofire @@ -159,6 +158,7 @@ SPEC REPOS: - UIDeviceIdentifier - WordPress-Aztec-iOS - WordPress-Editor-iOS + - WordPressKit - WordPressUI - wpxmlrpc - ZendeskCommonUISDK @@ -175,13 +175,7 @@ EXTERNAL SOURCES: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 Gutenberg: - :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-897f363e6c8c7d81bc7c33dd140b787c6411946a.podspec - WordPressAuthenticator: - :commit: fa06fca7178b268d382d91861752b3be0729e8a8 - :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git - WordPressKit: - :commit: b5c2bd39ec8f478dd53ecb7533ad025aad48f42e - :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git + :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-e4abec201fc3d79d32d28752e2477413be787659.podspec CHECKOUT OPTIONS: FSInteractiveMap: @@ -200,7 +194,7 @@ SPEC CHECKSUMS: FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86 Gifu: 416d4e38c4c2fed012f019e0a1d3ffcb58e5b842 Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d - Gutenberg: d873c23fa05f4509c8cf17f8bd49808d3aee4f16 + Gutenberg: 675ed62028dd2b197ca705e519cf9676f398827a JTAppleCalendar: 16c6501b22cb27520372c28b0a2e0b12c8d0cd73 Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08 MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae @@ -219,7 +213,7 @@ SPEC CHECKSUMS: WordPress-Aztec-iOS: fbebd569c61baa252b3f5058c0a2a9a6ada686bb WordPress-Editor-iOS: bda9f7f942212589b890329a0cb22547311749ef WordPressAuthenticator: 0891ba77c788044d32fe67a4d0435fdd598cecbd - WordPressKit: 7189845e0325fc6022a02638b572e1de8c1d7cc6 + WordPressKit: c1ba7b4f531693a0914f676423808fdffd820d81 WordPressShared: cad7777b283d3ce2752f283df587342a581cd49b WordPressUI: a491454affda3b0fb812812e637dc5e8f8f6bd06 wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd From bf07e034b3cd82ed25a61f6b1564c48c51cab526 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Fri, 23 Feb 2024 17:40:13 +0000 Subject: [PATCH 12/14] Update RELEASE-NOTES with "Jetpack-only" prefix --- RELEASE-NOTES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 606935bcbebd..536241f56190 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,6 +1,6 @@ 24.4 ----- -* [**] Block editor: Introduce VideoPress v5 support, to fix issues using video block with dotcom and Jetpack sites [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6634] +* [**] [Jetpack-only] Block editor: Introduce VideoPress v5 support, to fix issues using video block with dotcom and Jetpack sites [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6634] * [**] [internal] Refactored .org REST API calls. [#22612] 24.3 From 73071b958c482dae66c4f82f7f4dcde5a7528e9f Mon Sep 17 00:00:00 2001 From: Siobhan Date: Fri, 23 Feb 2024 18:25:41 +0000 Subject: [PATCH 13/14] Update Gutenberg Mobile reference --- Gutenberg/config.yml | 2 +- Podfile.lock | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Gutenberg/config.yml b/Gutenberg/config.yml index 524edcc077e2..2b2596c8d375 100644 --- a/Gutenberg/config.yml +++ b/Gutenberg/config.yml @@ -9,6 +9,6 @@ # # LOCAL_GUTENBERG=../my-gutenberg-fork bundle exec pod install ref: - commit: e4abec201fc3d79d32d28752e2477413be787659 + commit: v1.113.0-alpha1 github_org: wordpress-mobile repo_name: gutenberg-mobile diff --git a/Podfile.lock b/Podfile.lock index d9910d3f5901..815cc911ab9b 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -106,7 +106,7 @@ DEPENDENCIES: - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`) - Gifu (= 3.3.1) - Gridicons (~> 1.2) - - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-e4abec201fc3d79d32d28752e2477413be787659.podspec`) + - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.113.0-alpha1.podspec`) - JTAppleCalendar (~> 8.0.5) - Kanvas (~> 1.4.4) - MediaEditor (>= 1.2.2, ~> 1.2) @@ -158,7 +158,6 @@ SPEC REPOS: - UIDeviceIdentifier - WordPress-Aztec-iOS - WordPress-Editor-iOS - - WordPressKit - WordPressUI - wpxmlrpc - ZendeskCommonUISDK @@ -175,7 +174,10 @@ EXTERNAL SOURCES: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 Gutenberg: - :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-e4abec201fc3d79d32d28752e2477413be787659.podspec + :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.113.0-alpha1.podspec + WordPressKit: + :commit: 7c01ab3f347d16c083239ce9f2945636e7fd4611 + :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git CHECKOUT OPTIONS: FSInteractiveMap: @@ -197,7 +199,7 @@ SPEC CHECKSUMS: FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86 Gifu: 416d4e38c4c2fed012f019e0a1d3ffcb58e5b842 Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d - Gutenberg: 675ed62028dd2b197ca705e519cf9676f398827a + Gutenberg: fc2335dc3877dbeeb0c0a92d0fed5dc0a13751ba JTAppleCalendar: 16c6501b22cb27520372c28b0a2e0b12c8d0cd73 Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08 MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae From 8eb6f0252519db945faa47ddb448087b1d4a1f8f Mon Sep 17 00:00:00 2001 From: Siobhan Date: Fri, 23 Feb 2024 18:26:53 +0000 Subject: [PATCH 14/14] Fix typo in config --- Gutenberg/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gutenberg/config.yml b/Gutenberg/config.yml index 2b2596c8d375..bef9f3fd624b 100644 --- a/Gutenberg/config.yml +++ b/Gutenberg/config.yml @@ -9,6 +9,6 @@ # # LOCAL_GUTENBERG=../my-gutenberg-fork bundle exec pod install ref: - commit: v1.113.0-alpha1 + tag: v1.113.0-alpha1 github_org: wordpress-mobile repo_name: gutenberg-mobile