Merge pull request #20005 from wordpress-mobile/gutenberg/disable-sto…

…ry-block [Gutenberg] Disable Story block
wordpress-mobile · Jan 26, 2024 · 6311d54 · 6311d54
2 parents d1e9ff2 + a127530
commit 6311d54
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 6 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
@@ -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),
-                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.112.0-alpha3'
     wordPressAztecVersion = 'v2.0'
     wordPressFluxCVersion = '2.61.0'
     wordPressLoginVersion = '1.10.0'

diff --git a/config/gradle/included_builds.gradle b/config/gradle/included_builds.gradle
@@ -1,6 +1,6 @@
 gradle.ext.fluxCBinaryPath = "org.wordpress:fluxc"
 gradle.ext.wputilsBinaryPath = "org.wordpress:utils"
-gradle.ext.gutenbergMobileBinaryPath = "org.wordpress-mobile.gutenberg-mobile:react-native-gutenberg-bridge"
+gradle.ext.gutenbergMobileBinaryPath = "org.wordpress.gutenberg-mobile:react-native-gutenberg-bridge"
 gradle.ext.includedBuildGutenbergMobilePath = null
 gradle.ext.loginFlowBinaryPath = "org.wordpress:login"
 gradle.ext.storiesAndroidPath = "com.automattic:stories"

diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle
@@ -11,6 +11,7 @@ repositories {
         content {
             includeGroup "org.wordpress"
             includeGroup "org.wordpress.aztec"
+            includeGroup "org.wordpress.gutenberg-mobile"
             includeGroupByRegex "org.wordpress.react-native-libraries.*"
             // 'org.wordpress-mobile' group is deprecated. It's kept for now for smoother transition
             // but it should be removed soon (within couple weeks)

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,