From 67401c43d180ad9cf4a1eb558e792d83486c5784 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 11 May 2021 19:35:17 +0200 Subject: [PATCH 01/15] Add enableReusableBlock into Gutenberg props --- .../java/org/wordpress/android/ui/posts/EditPostActivity.java | 3 +++ .../android/editor/gutenberg/GutenbergPropsBuilder.kt | 2 ++ 2 files changed, 5 insertions(+) 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 89d64960ab00..24669d89e56a 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 @@ -2280,6 +2280,9 @@ private GutenbergPropsBuilder getGutenbergPropsBuilder() { isUnsupportedBlockEditorEnabled, unsupportedBlockEditorSwitch, !isFreeWPCom, // Disable audio block until it's usable on free sites via "Insert from URL" capability + // 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 + mSite.isWPCom(), wpcomLocaleSlug, postType, featuredImageId, diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt index 330406e848b2..2ee32d3d6f57 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt @@ -15,6 +15,7 @@ data class GutenbergPropsBuilder( private val enableUnsupportedBlockEditor: Boolean, private val unsupportedBlockEditorSwitch: Boolean, private val enableAudioBlock: Boolean, + private val enableReusableBlock: Boolean, private val localeSlug: String, private val postType: String, private val featuredImageId: Int, @@ -28,6 +29,7 @@ data class GutenbergPropsBuilder( enableUnsupportedBlockEditor = enableUnsupportedBlockEditor, canEnableUnsupportedBlockEditor = unsupportedBlockEditorSwitch, enableAudioBlock = enableAudioBlock, + enableReusableBlock = enableReusableBlock, localeSlug = localeSlug, postType = postType, featuredImageId = featuredImageId, From 85c7fac2ae4ff98cb72f3b1c411bd5648b4189e9 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Wed, 12 May 2021 13:44:07 +0200 Subject: [PATCH 02/15] Update Gutenberg Mobile ref --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 98f1a0f8fc17..cccb5796ca29 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { ext.kotlin_ktx_version = '1.2.0' ext.wordPressUtilsVersion = '1.40.0' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = 'v1.52.0' + ext.gutenbergMobileVersion = '3490-f9e6b0bcdd6f519f2c7424378681fc77f77a1fce' repositories { google() From 9d3bec207b334fa01c9743ecbc827032b660ce31 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Wed, 12 May 2021 14:05:54 +0200 Subject: [PATCH 03/15] Update release notes --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index e2e3bbc70c47..7f9782916922 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -2,6 +2,7 @@ 17.4 ----- +* [***] Block Editor: New Block: Reusable block. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3490] 17.3 From 936d8020fb969d77aeadeb1e997ce4df94f8e06d Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Thu, 13 May 2021 18:12:39 +0200 Subject: [PATCH 04/15] Add atomic sites to reusable block capability --- .../java/org/wordpress/android/ui/posts/EditPostActivity.java | 3 ++- 1 file changed, 2 insertions(+), 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 24669d89e56a..1639c1bcc435 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 @@ -2271,6 +2271,7 @@ private GutenbergPropsBuilder getGutenbergPropsBuilder() { boolean unsupportedBlockEditorSwitch = !mIsJetpackSsoEnabled && "gutenberg".equals(mSite.getWebEditor()); boolean isFreeWPCom = mSite.isWPCom() && SiteUtils.onFreePlan(mSite); + boolean isWPComSite = mSite.isWPCom() || mSite.isWPComAtomic(); return new GutenbergPropsBuilder( mContactInfoBlockFeatureConfig.isEnabled() && SiteUtils.supportsContactInfoFeature(mSite), @@ -2282,7 +2283,7 @@ private GutenbergPropsBuilder getGutenbergPropsBuilder() { !isFreeWPCom, // Disable audio block until it's usable on free sites via "Insert from URL" capability // 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 - mSite.isWPCom(), + isWPComSite, wpcomLocaleSlug, postType, featuredImageId, From efa3e20a2a5fd46d68d2014cc1c63f2c5bfa6d17 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Thu, 13 May 2021 19:39:39 +0200 Subject: [PATCH 05/15] Update Gutenberg Mobile ref --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 30d86577c977..6c41ba253415 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { ext.kotlin_ktx_version = '1.2.0' ext.wordPressUtilsVersion = '1.40.0' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = 'develop-b34dd4a03c462e285aab5a391ebf84799fbba48b' + ext.gutenbergMobileVersion = '3490-b17148f255d905b66a0680d30718cb0586d83b97' repositories { google() From afdabad7c0d4345060eaf90e18f1e9205b254337 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 14 May 2021 11:15:27 +0200 Subject: [PATCH 06/15] Update Gutenberg Mobile ref --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6c41ba253415..61a1cc4310b3 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { ext.kotlin_ktx_version = '1.2.0' ext.wordPressUtilsVersion = '1.40.0' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = '3490-b17148f255d905b66a0680d30718cb0586d83b97' + ext.gutenbergMobileVersion = '3490-7f311f2a96ca2153999bf67324302d13c84deff5' repositories { google() From 6d0845c95b0d4518d21bdba7994d99f3b8a6c0aa Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 14 May 2021 13:31:53 +0200 Subject: [PATCH 07/15] Update Gutenberg Mobile ref --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 61a1cc4310b3..3beb9e12756c 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { ext.kotlin_ktx_version = '1.2.0' ext.wordPressUtilsVersion = '1.40.0' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = '3490-7f311f2a96ca2153999bf67324302d13c84deff5' + ext.gutenbergMobileVersion = '3490-3e38ec0ce8b49867c42270b2cd22045c01af2d1d' repositories { google() From 29b9e86763b6fe26b8a63b420e757e9ef41f6189 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 21 May 2021 13:51:34 +0200 Subject: [PATCH 08/15] Update Gutenberg Mobile ref --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5f86ce9caa36..0488f6b7164b 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { ext.kotlin_ktx_version = '1.2.0' ext.wordPressUtilsVersion = '1.40.0' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = 'v1.53.0' + ext.gutenbergMobileVersion = 'v1.54.0-alpha1' repositories { google() From 6bb6265c41d5f6c0b4a49679285377c42f038c78 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 21 May 2021 13:52:11 +0200 Subject: [PATCH 09/15] Update release notes --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index b396b47fe2b1..7c4c4c127a91 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -3,6 +3,7 @@ 17.5 ----- * [***] Block Editor: New Block: Reusable block. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3490] +* [***] Block Editor: Add reusable blocks to the block inserter menu. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3054] 17.4 From e1848b404c59c51c69fe18a9f3c613545cac6540 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Mon, 24 May 2021 16:21:12 +0200 Subject: [PATCH 10/15] Update Gutenberg Mobile ref --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0488f6b7164b..a1f484f6b1da 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { ext.kotlin_ktx_version = '1.2.0' ext.wordPressUtilsVersion = '1.40.0' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = 'v1.54.0-alpha1' + ext.gutenbergMobileVersion = 'develop-67fcf4ffbdf0320542eeff528583b57e8aa9bcc4' repositories { google() From e259d5183769d3afc3bea44fc6534d2ba269cd11 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Mon, 24 May 2021 16:45:42 +0200 Subject: [PATCH 11/15] [TEST] Update Gutenberg Mobile ref to old commit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a1f484f6b1da..6ac84234282e 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { ext.kotlin_ktx_version = '1.2.0' ext.wordPressUtilsVersion = '1.40.0' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = 'develop-67fcf4ffbdf0320542eeff528583b57e8aa9bcc4' + ext.gutenbergMobileVersion = 'develop-05d21feadcadcb799fc956291b2198f725b1a39d' repositories { google() From 048a79f662f3daeb097aa7487df9d8e9f2f14c6d Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Mon, 24 May 2021 16:52:06 +0200 Subject: [PATCH 12/15] Revert "[TEST] Update Gutenberg Mobile ref to old commit" This reverts commit e259d5183769d3afc3bea44fc6534d2ba269cd11. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6ac84234282e..a1f484f6b1da 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { ext.kotlin_ktx_version = '1.2.0' ext.wordPressUtilsVersion = '1.40.0' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = 'develop-05d21feadcadcb799fc956291b2198f725b1a39d' + ext.gutenbergMobileVersion = 'develop-67fcf4ffbdf0320542eeff528583b57e8aa9bcc4' repositories { google() From db8d13cb675ee1e943399e816aeec9b9460590e9 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 25 May 2021 10:24:13 +0200 Subject: [PATCH 13/15] Update Gutenberg Mobile ref --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a1f484f6b1da..0488f6b7164b 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { ext.kotlin_ktx_version = '1.2.0' ext.wordPressUtilsVersion = '1.40.0' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = 'develop-67fcf4ffbdf0320542eeff528583b57e8aa9bcc4' + ext.gutenbergMobileVersion = 'v1.54.0-alpha1' repositories { google() From d247472bee105ee69d5de2f6798de8d6acf9b8c5 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Wed, 26 May 2021 12:32:20 +0200 Subject: [PATCH 14/15] Update Gutenberg Mobile ref --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0488f6b7164b..f11560728082 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { ext.kotlin_ktx_version = '1.2.0' ext.wordPressUtilsVersion = '1.40.0' ext.detektVersion = '1.15.0' - ext.gutenbergMobileVersion = 'v1.54.0-alpha1' + ext.gutenbergMobileVersion = 'develop-c55652b5fabf0e4edd08b79da4b78418aa886410' repositories { google() From 2632da080497616e7331dd9adc08869441c40e1a Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Wed, 26 May 2021 12:34:49 +0200 Subject: [PATCH 15/15] Revert Stories lib ref change The ref was accidentally changed when resolving conflicts with develop branch. --- libs/stories-android | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/stories-android b/libs/stories-android index 8866392ad6c4..98983cbfc67b 160000 --- a/libs/stories-android +++ b/libs/stories-android @@ -1 +1 @@ -Subproject commit 8866392ad6c4a275d3960d033d89a90eb21f5c4c +Subproject commit 98983cbfc67bdf48c0b4d95ae54a05a9d1ecf448