From 2fc9592ab45ff14946ea70fc859588b76c72d2a3 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 23 Jan 2024 13:45:52 +0100 Subject: [PATCH 1/5] Disable Story block --- .../Classes/ViewRelated/Gutenberg/GutenbergViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift index 6f3854294701..336761cbf53b 100644 --- a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift +++ b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift @@ -1252,7 +1252,7 @@ extension GutenbergViewController: GutenbergBridgeDataSource { .unsupportedBlockEditor: isUnsupportedBlockEditorEnabled, .canEnableUnsupportedBlockEditor: post.blog.jetpack?.isConnected ?? false, .isAudioBlockMediaUploadEnabled: !isFreeWPCom, - .mediaFilesCollectionBlock: post.blog.supports(.stories) && !UIDevice.isPad(), + .mediaFilesCollectionBlock: false, // Only enable reusable block in WP.com sites until the issue // (https://github.com/wordpress-mobile/gutenberg-mobile/issues/3457) in self-hosted sites is fixed .reusableBlock: isWPComSite, From 2c08d38f2bda38990e69c9c5055e578e84730769 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 23 Jan 2024 19:13:32 +0100 Subject: [PATCH 2/5] Update Gutenberg Mobile reference --- Gutenberg/config.yml | 2 +- Podfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gutenberg/config.yml b/Gutenberg/config.yml index a065d41d0ff3..d7d0b0f8a7e2 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.111.0-alpha2 + commit: 2d7cfb9b0308cebdd0f970ff8023d89e660dfb55 github_org: wordpress-mobile repo_name: gutenberg-mobile diff --git a/Podfile.lock b/Podfile.lock index 3c5f41e6056d..59f23ed7b531 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -26,7 +26,7 @@ PODS: - FSInteractiveMap (0.1.0) - Gifu (3.3.1) - Gridicons (1.2.0) - - Gutenberg (1.110.0) + - Gutenberg (1.111.0) - JTAppleCalendar (8.0.5) - Kanvas (1.4.9): - CropViewController @@ -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.111.0-alpha2.podspec`) + - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-2d7cfb9b0308cebdd0f970ff8023d89e660dfb55.podspec`) - JTAppleCalendar (~> 8.0.5) - Kanvas (~> 1.4.4) - MediaEditor (>= 1.2.2, ~> 1.2) @@ -174,7 +174,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.111.0-alpha2.podspec + :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-2d7cfb9b0308cebdd0f970ff8023d89e660dfb55.podspec WordPressShared: :commit: 47c5cbfc781b6aa7f577fbc413236c739e4332b4 :git: https://github.com/wordpress-mobile/WordPress-iOS-Shared.git @@ -199,7 +199,7 @@ SPEC CHECKSUMS: FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86 Gifu: 416d4e38c4c2fed012f019e0a1d3ffcb58e5b842 Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d - Gutenberg: b16b910a18641f40a8fa328bf593bc78931d561e + Gutenberg: 8cb76a0a8068d6e7d48552d274d536974971ed9b JTAppleCalendar: 16c6501b22cb27520372c28b0a2e0b12c8d0cd73 Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08 MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae From e09875e3a8c23bb82fa8c443f0713d7615a6ab78 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 23 Jan 2024 19:13:46 +0100 Subject: [PATCH 3/5] Remove initial prop to control Story block --- .../Classes/ViewRelated/Gutenberg/GutenbergViewController.swift | 2 -- 1 file changed, 2 deletions(-) diff --git a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift index 336761cbf53b..6b6192b66b43 100644 --- a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift +++ b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift @@ -1230,7 +1230,6 @@ extension GutenbergViewController: GutenbergBridgeDataSource { .unsupportedBlockEditor: false, .canEnableUnsupportedBlockEditor: false, .isAudioBlockMediaUploadEnabled: !isFreeWPCom, - .mediaFilesCollectionBlock: false, .reusableBlock: false, .shouldUseFastImage: !post.blog.isPrivate(), .facebookEmbed: false, @@ -1252,7 +1251,6 @@ extension GutenbergViewController: GutenbergBridgeDataSource { .unsupportedBlockEditor: isUnsupportedBlockEditorEnabled, .canEnableUnsupportedBlockEditor: post.blog.jetpack?.isConnected ?? false, .isAudioBlockMediaUploadEnabled: !isFreeWPCom, - .mediaFilesCollectionBlock: false, // Only enable reusable block in WP.com sites until the issue // (https://github.com/wordpress-mobile/gutenberg-mobile/issues/3457) in self-hosted sites is fixed .reusableBlock: isWPComSite, From 4cd2baf7c2c27426da7adb097dad60d4452dc488 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Thu, 25 Jan 2024 15:26:17 +0100 Subject: [PATCH 4/5] Update Gutenberg Mobile reference --- Gutenberg/config.yml | 2 +- Podfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gutenberg/config.yml b/Gutenberg/config.yml index d7d0b0f8a7e2..15bbd3382112 100644 --- a/Gutenberg/config.yml +++ b/Gutenberg/config.yml @@ -9,6 +9,6 @@ # # LOCAL_GUTENBERG=../my-gutenberg-fork bundle exec pod install ref: - commit: 2d7cfb9b0308cebdd0f970ff8023d89e660dfb55 + commit: 674dc6550184c3b60cbb392091f7e9166ab06cad github_org: wordpress-mobile repo_name: gutenberg-mobile diff --git a/Podfile.lock b/Podfile.lock index 59f23ed7b531..29c38ebd8999 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -26,7 +26,7 @@ PODS: - FSInteractiveMap (0.1.0) - Gifu (3.3.1) - Gridicons (1.2.0) - - Gutenberg (1.111.0) + - Gutenberg (1.111.1) - JTAppleCalendar (8.0.5) - Kanvas (1.4.9): - CropViewController @@ -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-2d7cfb9b0308cebdd0f970ff8023d89e660dfb55.podspec`) + - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-674dc6550184c3b60cbb392091f7e9166ab06cad.podspec`) - JTAppleCalendar (~> 8.0.5) - Kanvas (~> 1.4.4) - MediaEditor (>= 1.2.2, ~> 1.2) @@ -174,7 +174,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-2d7cfb9b0308cebdd0f970ff8023d89e660dfb55.podspec + :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-674dc6550184c3b60cbb392091f7e9166ab06cad.podspec WordPressShared: :commit: 47c5cbfc781b6aa7f577fbc413236c739e4332b4 :git: https://github.com/wordpress-mobile/WordPress-iOS-Shared.git @@ -199,7 +199,7 @@ SPEC CHECKSUMS: FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86 Gifu: 416d4e38c4c2fed012f019e0a1d3ffcb58e5b842 Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d - Gutenberg: 8cb76a0a8068d6e7d48552d274d536974971ed9b + Gutenberg: f7ac0640a3a9da1670882d4d727b81f5837b6832 JTAppleCalendar: 16c6501b22cb27520372c28b0a2e0b12c8d0cd73 Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08 MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae From a754b74ca63be5072af4e2b72070b7fcb2134036 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 26 Jan 2024 17:57:01 +0100 Subject: [PATCH 5/5] Update Gutenberg Mobile reference with tag --- 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 15bbd3382112..0871836bc31c 100644 --- a/Gutenberg/config.yml +++ b/Gutenberg/config.yml @@ -9,6 +9,6 @@ # # LOCAL_GUTENBERG=../my-gutenberg-fork bundle exec pod install ref: - commit: 674dc6550184c3b60cbb392091f7e9166ab06cad + tag: v1.112.0-alpha3 github_org: wordpress-mobile repo_name: gutenberg-mobile diff --git a/Podfile.lock b/Podfile.lock index 29c38ebd8999..072182be1277 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-674dc6550184c3b60cbb392091f7e9166ab06cad.podspec`) + - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.112.0-alpha3.podspec`) - JTAppleCalendar (~> 8.0.5) - Kanvas (~> 1.4.4) - MediaEditor (>= 1.2.2, ~> 1.2) @@ -174,7 +174,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-674dc6550184c3b60cbb392091f7e9166ab06cad.podspec + :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.112.0-alpha3.podspec WordPressShared: :commit: 47c5cbfc781b6aa7f577fbc413236c739e4332b4 :git: https://github.com/wordpress-mobile/WordPress-iOS-Shared.git @@ -199,7 +199,7 @@ SPEC CHECKSUMS: FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86 Gifu: 416d4e38c4c2fed012f019e0a1d3ffcb58e5b842 Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d - Gutenberg: f7ac0640a3a9da1670882d4d727b81f5837b6832 + Gutenberg: 69f7bd049f723c9574bbbc7019ecaf8bb6bb477f JTAppleCalendar: 16c6501b22cb27520372c28b0a2e0b12c8d0cd73 Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08 MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae