From f4983b0be0ca29cb36ce2eba20c2d117c6915f9b Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 23 Jan 2024 16:41:20 +0100 Subject: [PATCH 1/8] 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 651aef792784da0b90344698feb92cf3f25ba3fe Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 23 Jan 2024 18:30:06 +0100 Subject: [PATCH 2/8] Update Gutenberg Mobile reference --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0d1aa95ca11a..1b836d9383cc 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.0' + gutenbergMobileVersion = '6568-2d7cfb9b0308cebdd0f970ff8023d89e660dfb55' wordPressAztecVersion = 'v1.9.0' wordPressFluxCVersion = '2.61.0' wordPressLoginVersion = '1.10.0' From dc2b0e876cd16e9dd41d78b64588282ee817c141 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 23 Jan 2024 18:30:39 +0100 Subject: [PATCH 3/8] 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 79018e5cdbac3a708b99be8ddb34dfa4b25914f8 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Thu, 25 Jan 2024 12:35:30 +0100 Subject: [PATCH 4/8] Update Gutenberg Mobile reference --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1b836d9383cc..a5c768978d42 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 = '6568-2d7cfb9b0308cebdd0f970ff8023d89e660dfb55' + gutenbergMobileVersion = '6568-0f3651afefe61f4ec6e45489eda307b4ca9d62b3' wordPressAztecVersion = 'v1.9.0' wordPressFluxCVersion = '2.61.0' wordPressLoginVersion = '1.10.0' From 6f5e57c8d9e8cc447d623bd8ef21679bc35f53d2 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Thu, 25 Jan 2024 13:36:15 +0100 Subject: [PATCH 5/8] Update Gutenberg Mobile reference --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a5c768978d42..fe486b0b87f9 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 = '6568-0f3651afefe61f4ec6e45489eda307b4ca9d62b3' + gutenbergMobileVersion = '6568-674dc6550184c3b60cbb392091f7e9166ab06cad' wordPressAztecVersion = 'v1.9.0' wordPressFluxCVersion = '2.61.0' wordPressLoginVersion = '1.10.0' From df45fc7909d27e5478d5b8b3d100e5449ca7de06 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Thu, 25 Jan 2024 15:25:38 +0100 Subject: [PATCH 6/8] Update Gutenberg Mobile binary path to use new group id --- config/gradle/included_builds.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/gradle/included_builds.gradle b/config/gradle/included_builds.gradle index 30075447e471..493a2dedb405 100644 --- 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" From 8c233d433e66698453223384f3227b218b5ba306 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Thu, 25 Jan 2024 15:26:01 +0100 Subject: [PATCH 7/8] Include new group id in editor `build.gradle` --- libs/editor/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle index 288035530a8a..6f518cf2b000 100644 --- 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) From 4bc201c469240062cefaf01b918312d74d29c19c Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 26 Jan 2024 17:03:03 +0100 Subject: [PATCH 8/8] 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 fe486b0b87f9..913ad424afe0 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 = '6568-674dc6550184c3b60cbb392091f7e9166ab06cad' + gutenbergMobileVersion = 'v1.112.0-alpha3' wordPressAztecVersion = 'v1.9.0' wordPressFluxCVersion = '2.61.0' wordPressLoginVersion = '1.10.0'