From a4716de0a1cb3f7aa65b171ccdf539f8b975496e Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 26 Jan 2024 13:30:00 +0100 Subject: [PATCH 1/5] Update Gutenberg Mobile reference --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5cb7f225ec83..8ccb2fce17eb 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ ext { automatticRestVersion = '1.0.8' automatticStoriesVersion = '2.4.0' automatticTracksVersion = '3.3.0' - gutenbergMobileVersion = 'v1.111.1' + gutenbergMobileVersion = '6580-9fe963032e189dc6bb8dbbb4b9238d34759c0ed8' wordPressAztecVersion = 'v1.9.0' wordPressFluxCVersion = '2.61.0' wordPressLoginVersion = '1.10.0' From e66ac0789fe035600cf80c8162802757621bb183 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 23 Jan 2024 16:41:20 +0100 Subject: [PATCH 2/5] Disable Story block --- .../java/org/wordpress/android/ui/posts/EditPostActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java index a6884db857a2..5a4637715143 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java @@ -2513,7 +2513,7 @@ private GutenbergPropsBuilder getGutenbergPropsBuilder() { SiteUtils.supportsEmbedVariationFeature(mSite, SiteUtils.WP_INSTAGRAM_EMBED_JETPACK_VERSION), SiteUtils.supportsEmbedVariationFeature(mSite, SiteUtils.WP_LOOM_EMBED_JETPACK_VERSION), SiteUtils.supportsEmbedVariationFeature(mSite, SiteUtils.WP_SMARTFRAME_EMBED_JETPACK_VERSION), - SiteUtils.supportsStoriesFeature(mSite, mJetpackFeatureRemovalPhaseHelper), + false, mSite.isUsingWpComRestApi(), enableXPosts, isUnsupportedBlockEditorEnabled, From f2e21cb8b0a3ff2463811ba6cbc3971633df70ac Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 23 Jan 2024 18:30:39 +0100 Subject: [PATCH 3/5] Remove initial prop to control Story block --- .../java/org/wordpress/android/ui/posts/EditPostActivity.java | 2 -- .../wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt | 2 -- 2 files changed, 4 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java index 5a4637715143..b9fbbf75af0f 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java @@ -2490,7 +2490,6 @@ private GutenbergPropsBuilder getGutenbergPropsBuilder() { false, false, false, - false, true, false, !isFreeWPCom, @@ -2513,7 +2512,6 @@ private GutenbergPropsBuilder getGutenbergPropsBuilder() { SiteUtils.supportsEmbedVariationFeature(mSite, SiteUtils.WP_INSTAGRAM_EMBED_JETPACK_VERSION), SiteUtils.supportsEmbedVariationFeature(mSite, SiteUtils.WP_LOOM_EMBED_JETPACK_VERSION), SiteUtils.supportsEmbedVariationFeature(mSite, SiteUtils.WP_SMARTFRAME_EMBED_JETPACK_VERSION), - false, mSite.isUsingWpComRestApi(), enableXPosts, isUnsupportedBlockEditorEnabled, diff --git a/libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt b/libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt index c4117e0251f9..53ad2c0c9aae 100644 --- a/libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt +++ b/libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt @@ -18,7 +18,6 @@ data class GutenbergPropsBuilder( private val enableInstagramEmbed: Boolean, private val enableLoomEmbed: Boolean, private val enableSmartframeEmbed: Boolean, - private val enableMediaFilesCollectionBlocks: Boolean, private val enableMentions: Boolean, private val enableXPosts: Boolean, private val enableUnsupportedBlockEditor: Boolean, @@ -43,7 +42,6 @@ data class GutenbergPropsBuilder( enableInstagramEmbed = enableInstagramEmbed, enableLoomEmbed = enableLoomEmbed, enableSmartframeEmbed = enableSmartframeEmbed, - enableMediaFilesCollectionBlocks = enableMediaFilesCollectionBlocks, enableMentions = enableMentions, enableXPosts = enableXPosts, enableUnsupportedBlockEditor = enableUnsupportedBlockEditor, From aa4f6eb8bba1967f5e133796fca809aea1401008 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 26 Jan 2024 16:08:21 +0100 Subject: [PATCH 4/5] Update release notes --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index e835d3e7d3e2..592153fa492d 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -7,6 +7,7 @@ 24.1 ----- * [**] Disabled the ability of creating new Story posts. [#20014] +* [**] Disable Story block [https://github.com/wordpress-mobile/WordPress-Android/pull/20005] 24.0.1 ----- From 6419fcd89a7e13cceec87e818e68304272de7f9c Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 26 Jan 2024 19:14:08 +0100 Subject: [PATCH 5/5] Update Gutenberg Mobile reference with tag --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8ccb2fce17eb..e29ad0136166 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ ext { automatticRestVersion = '1.0.8' automatticStoriesVersion = '2.4.0' automatticTracksVersion = '3.3.0' - gutenbergMobileVersion = '6580-9fe963032e189dc6bb8dbbb4b9238d34759c0ed8' + gutenbergMobileVersion = 'v1.111.2' wordPressAztecVersion = 'v1.9.0' wordPressFluxCVersion = '2.61.0' wordPressLoginVersion = '1.10.0'