Merge pull request #20051 from wordpress-mobile/gutenberg/integrate_r…

…elease_1.111.2 Integrate gutenberg-mobile release v1.111.2
wordpress-mobile · Jan 26, 2024 · cf3f220 · cf3f220
2 parents a96ae9d + 6419fcd
commit cf3f220
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git 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
 -----

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
@@ -2487,7 +2487,6 @@ private GutenbergPropsBuilder getGutenbergPropsBuilder() {
                     false,
                     false,
                     false,
-                    false,
                     true,
                     false,
                     !isFreeWPCom,
@@ -2510,7 +2509,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),
-                SiteUtils.supportsStoriesFeature(mSite, mJetpackFeatureRemovalPhaseHelper),
                 mSite.isUsingWpComRestApi(),
                 enableXPosts,
                 isUnsupportedBlockEditorEnabled,

diff --git 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 = 'v1.111.2'
     wordPressAztecVersion = 'v1.9.0'
     wordPressFluxCVersion = '2.61.0'
     wordPressLoginVersion = '1.10.0'

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
@@ -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,