From 128ce039a6da72381101e4bbfa1abb7618f14594 Mon Sep 17 00:00:00 2001 From: Cameron Voell Date: Tue, 19 May 2020 21:15:42 -0700 Subject: [PATCH 01/33] Updated RN aztec and bridge locations for monorepo --- libs/editor/WordPressEditor/build.gradle | 2 +- settings.gradle | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/editor/WordPressEditor/build.gradle b/libs/editor/WordPressEditor/build.gradle index 758761e072b5..ae57548035af 100644 --- a/libs/editor/WordPressEditor/build.gradle +++ b/libs/editor/WordPressEditor/build.gradle @@ -75,7 +75,7 @@ dependencies { api ("com.github.wordpress-mobile.WordPress-Aztec-Android:wordpress-shortcodes:$aztecVersion") api ("com.github.wordpress-mobile.WordPress-Aztec-Android:wordpress-comments:$aztecVersion") - implementation (project(':react-native-gutenberg-bridge')) { + implementation (project(':@wordpress_react-native-bridge')) { exclude group: 'com.squareup.okhttp3' exclude group: "com.android.volley" exclude group: 'com.google.code.findbugs' diff --git a/settings.gradle b/settings.gradle index c93240da283e..59ac041ea058 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,11 +9,11 @@ include ':libs:login:WordPressLoginFlow' include ':WordPressMocks' project(':WordPressMocks').projectDir = new File(rootProject.projectDir, properties.getOrDefault('wp.wordpress_mocks_path', 'libs/mocks') + '/WordPressMocks') -include ':react-native-aztec' -project(':react-native-aztec').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/react-native-aztec/android') +include ':@wordpress_react-native-aztec' +project(':@wordpress_react-native-aztec').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android') -include ':react-native-gutenberg-bridge' -project(':react-native-gutenberg-bridge').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/react-native-gutenberg-bridge/android') +include ':@wordpress_react-native-bridge' +project(':@wordpress_react-native-bridge').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android') if (properties.getOrDefault('wp.BUILD_GUTENBERG_FROM_SOURCE', false).toBoolean()) { include ':react-native-linear-gradient' From fc90ec5a3febd411dd412e6ca1c7e07090a2dc2a Mon Sep 17 00:00:00 2001 From: Cameron Voell Date: Tue, 19 May 2020 22:26:52 -0700 Subject: [PATCH 02/33] Update gb-mobile to monorepo branch --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index fe0b27e85f1d..2621722d9387 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit fe0b27e85f1d8f460c2a36d88f8b6aa248f88c13 +Subproject commit 2621722d9387106c8d45c2358698e7eebcb90ea0 From 7eed50b7d5d3e69fce222544977440976bf43323 Mon Sep 17 00:00:00 2001 From: Cameron Voell Date: Tue, 19 May 2020 23:57:23 -0700 Subject: [PATCH 03/33] Update gb ref for updating node version --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 2621722d9387..e30750f0dea9 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 2621722d9387106c8d45c2358698e7eebcb90ea0 +Subproject commit e30750f0dea97de0963ec91db5e4653bb49660fe From d552343fa0a52a180102cbcb56e80f79d1075f60 Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Wed, 20 May 2020 11:34:27 +0200 Subject: [PATCH 04/33] Update lint baseline and gutenberg-mobile ref --- WordPress/lint-baseline.xml | 26 +++++++++++++------------- libs/gutenberg-mobile | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/WordPress/lint-baseline.xml b/WordPress/lint-baseline.xml index 42c2fd629297..0c05e626cf08 100644 --- a/WordPress/lint-baseline.xml +++ b/WordPress/lint-baseline.xml @@ -3991,7 +3991,7 @@ errorLine1=" classpath 'com.android.tools.build:gradle:3.4.2'" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -4007,7 +4007,7 @@ errorLine1=" implementation 'androidx.appcompat:appcompat:1.0.0'" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -4023,7 +4023,7 @@ errorLine1=" implementation 'androidx.appcompat:appcompat:1.0.0'" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -4039,7 +4039,7 @@ errorLine1=" implementation 'androidx.recyclerview:recyclerview:1.0.0'" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -4055,7 +4055,7 @@ errorLine1=" @ReactProp(name = PROP_TEXT)" errorLine2=" ~~~~~~~~~"> @@ -4071,7 +4071,7 @@ errorLine1=" private HashMap<Integer, Media> mMediaToAddAfterMounting = new HashMap<>();" errorLine2=" ~~~~~~~~~~~~~~~"> @@ -4087,7 +4087,7 @@ url="http://developer.android.com/design/style/iconography.html" urls="http://developer.android.com/design/style/iconography.html"> + file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/res/drawable-hdpi/ic_launcher.png"/> + file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/res/drawable-mdpi/ic_launcher.png"/> + file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/res/drawable-xhdpi/ic_launcher.png"/> + file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/res/drawable-xxhdpi/ic_launcher.png"/> @@ -4159,7 +4159,7 @@ errorLine1=" (int) update.getPaddingLeft()," errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~"> @@ -4175,7 +4175,7 @@ errorLine1=" (int) update.getPaddingRight()," errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~"> diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index e30750f0dea9..380298d439a4 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit e30750f0dea97de0963ec91db5e4653bb49660fe +Subproject commit 380298d439a49a4807931764587aa5ccbff29c6b From 6d0d444e39d3d7999eccfff414f54df2dcc9864e Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Mon, 1 Jun 2020 15:22:31 +0200 Subject: [PATCH 05/33] Update paths to react-native dependencies in settings.gradle --- settings.gradle | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/settings.gradle b/settings.gradle index 59ac041ea058..789918cdb0a4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,17 +17,19 @@ project(':@wordpress_react-native-bridge').projectDir = new File(rootProject.pro if (properties.getOrDefault('wp.BUILD_GUTENBERG_FROM_SOURCE', false).toBoolean()) { include ':react-native-linear-gradient' - project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/node_modules/react-native-linear-gradient/android') + project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/node_modules/react-native-linear-gradient/android') include ':react-native-svg' - project(':react-native-svg').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/node_modules/react-native-svg/android') + project(':react-native-svg').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/node_modules/react-native-svg/android') include ':react-native-aztec' - project(':react-native-aztec').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/react-native-aztec/android') + project(':react-native-aztec').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android') include ':react-native-recyclerview-list' - project(':react-native-recyclerview-list').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/node_modules/react-native-recyclerview-list/android') + project(':react-native-recyclerview-list').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/node_modules/react-native-recyclerview-list/android') include ':react-native-gutenberg-bridge' - project(':react-native-gutenberg-bridge').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/react-native-gutenberg-bridge/android') + project(':react-native-gutenberg-bridge').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android') include ':react-native-video' - project(':react-native-video').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/node_modules/react-native-video/android-exoplayer') + project(':react-native-video').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/node_modules/react-native-video/android-exoplayer') include ':@react-native-community_slider' - project(':@react-native-community_slider').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/node_modules/@react-native-community/slider/src/android') + project(':@react-native-community_slider').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/node_modules/@react-native-community/slider/src/android') + include ':react-native-get-random-values' + project(':react-native-get-random-values').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/node_modules/react-native-get-random-values/android') } From ecd232739a22f8b1f57bf2acf495d90edb647c9c Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Mon, 1 Jun 2020 15:22:49 +0200 Subject: [PATCH 06/33] Update gutenberg-mobile submodule --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 380298d439a4..d54edb865f08 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 380298d439a49a4807931764587aa5ccbff29c6b +Subproject commit d54edb865f08246a53c83b1e453e42ba0f2df40c From 177d8a39b447a9a946497f1c881e7678cd3d439f Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Mon, 1 Jun 2020 15:23:04 +0200 Subject: [PATCH 07/33] Update circle-ci config --- .circleci/config.yml | 55 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1b3bbeadbae7..879b95386545 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,22 +11,21 @@ commands: - run: name: Setup gradle.properties command: cp gradle.properties-example gradle.properties - yarn-install: + npm-install: steps: - restore_cache: - name: Restore Yarn Cache + name: Restore NPM Cache keys: - - yarn-i18n-v4-cache-v{{ .Environment.CACHE_TRIGGER_VERSION }}-job-{{ .Environment.CIRCLE_JOB }}-{{ checksum "libs/gutenberg-mobile/yarn.lock" }} + - dependencies-v1-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }} - run: - name: Yarn Install - working_directory: libs/gutenberg-mobile - command: yarn install --frozen-lockfile --prefer-offline --network-concurrency 1 + name: NPM Install + command: npm ci --prefer-offline - save_cache: - name: Save Yarn Cache - key: yarn-i18n-v4-cache-v{{ .Environment.CACHE_TRIGGER_VERSION }}-job-{{ .Environment.CIRCLE_JOB }}-{{ checksum "libs/gutenberg-mobile/yarn.lock" }} + name: Save NPM Cache + key: dependencies-v1-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }} paths: - - libs/gutenberg-mobile/node_modules - - libs/gutenberg-mobile/i18n-cache/data + - ~/.npm + - i18n-cache/data checkout-submodules: steps: - run: @@ -37,12 +36,12 @@ commands: - run: name: Checkout gutenberg-mobile submodule (no recursive) command: git submodule update --init - yarn-bundle-android: + npm-bundle-android: steps: - run: - name: Yarn bundle Android + name: Npm bundle Android working_directory: libs/gutenberg-mobile - command: yarn bundle:android + command: npm run bundle:android save-gutenberg-bundle-cache: steps: - run: @@ -54,7 +53,7 @@ commands: name: Cache JS Bundle key: android-js-bundle-{{ checksum "gutenberg_submodule_hash" }} paths: - - libs/gutenberg-mobile/react-native-gutenberg-bridge/android/build/assets/index.android.bundle + - libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets/index.android.bundle restore-gutenberg-bundle-cache: steps: - run: @@ -77,21 +76,21 @@ jobs: - run: name: Abort If JS Bundle Exists command: | - if [ -f "libs/gutenberg-mobile/react-native-gutenberg-bridge/android/build/assets/index.android.bundle" ]; then + if [ -f "libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets/index.android.bundle" ]; then echo "Gutenberg-Mobile bundle already in cache, no need to create a new one." circleci-agent step halt else echo "Gutenberg-Mobile bundle not found in cache. Proceeding to generate new bundle" fi - checkout-submodules - - yarn-install - - yarn-bundle-android + - npm-install + - npm-bundle-android - run: name: Ensure assets folder exists command: mkdir -p libs/gutenberg-mobile/react-native-gutenberg-bridge/android/build/assets - run: name: Move bundle to assets folder - command: mv libs/gutenberg-mobile/bundle/android/App.js libs/gutenberg-mobile/react-native-gutenberg-bridge/android/build/assets/index.android.bundle + command: mv libs/gutenberg-mobile/bundle/android/App.js libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets/index.android.bundle - save-gutenberg-bundle-cache test: executor: @@ -105,9 +104,9 @@ jobs: - restore-gutenberg-bundle-cache - run: name: Ensure assets folder exists - command: mkdir libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets + command: mkdir libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets - attach_workspace: - at: libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets + at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets - run: name: Test WordPress environment: @@ -132,9 +131,9 @@ jobs: - restore-gutenberg-bundle-cache - run: name: Ensure assets folder exists - command: mkdir libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets + command: mkdir libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets - attach_workspace: - at: libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets + at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets - run: name: Checkstyle environment: @@ -179,9 +178,9 @@ jobs: - restore-gutenberg-bundle-cache - run: name: Ensure assets folder exists - command: mkdir libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets + command: mkdir libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets - attach_workspace: - at: libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets + at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets - run: name: Build APK environment: @@ -224,9 +223,9 @@ jobs: - restore-gutenberg-bundle-cache - run: name: Ensure assets folder exists - command: mkdir libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets + command: mkdir libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets - attach_workspace: - at: libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets + at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets - run: name: Build environment: @@ -267,9 +266,9 @@ jobs: - restore-gutenberg-bundle-cache - run: name: Ensure assets folder exists - command: mkdir libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets + command: mkdir libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets - attach_workspace: - at: libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets + at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets - run: name: Build environment: From 104fdba216403adfc3ca3165b35c8f8ccb9fbb8b Mon Sep 17 00:00:00 2001 From: Ceyhun Ozugur Date: Wed, 3 Jun 2020 18:43:30 +0200 Subject: [PATCH 08/33] Update gutenberg-mobile ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index d54edb865f08..7fdd5ccd536c 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit d54edb865f08246a53c83b1e453e42ba0f2df40c +Subproject commit 7fdd5ccd536c60bfd45c807f62a25c3fe0f13167 From 509b2efd7e3d6130bd4cb6497ace1eb0e3dbf900 Mon Sep 17 00:00:00 2001 From: Cameron Voell Date: Thu, 4 Jun 2020 21:37:08 -0700 Subject: [PATCH 09/33] Update gutenberg ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 7fdd5ccd536c..e6b732eb85b1 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 7fdd5ccd536c60bfd45c807f62a25c3fe0f13167 +Subproject commit e6b732eb85b175524df9a8375f5357b4147bc481 From d0058fe057fa0ca81b536f5233da62e5f3fdc0bf Mon Sep 17 00:00:00 2001 From: Ceyhun Ozugur Date: Fri, 5 Jun 2020 12:16:41 +0200 Subject: [PATCH 10/33] Fix npm cache on CI --- .circleci/config.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 879b95386545..aea1f8caa31e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,16 +16,17 @@ commands: - restore_cache: name: Restore NPM Cache keys: - - dependencies-v1-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }} + - npm-i18n-v1-cache-v{{ .Environment.CACHE_TRIGGER_VERSION }}-job-{{ .Environment.CIRCLE_JOB }}-{{ checksum "libs/gutenberg-mobile/package-lock.json" }} - run: name: NPM Install + working_directory: libs/gutenberg-mobile command: npm ci --prefer-offline - save_cache: name: Save NPM Cache - key: dependencies-v1-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }} + key: npm-i18n-v1-cache-v{{ .Environment.CACHE_TRIGGER_VERSION }}-job-{{ .Environment.CIRCLE_JOB }}-{{ checksum "libs/gutenberg-mobile/package-lock.json" }} paths: - ~/.npm - - i18n-cache/data + - libs/gutenberg-mobile/i18n-cache/data checkout-submodules: steps: - run: From 512a52bdfebead900bc341147ff8eae40baa9843 Mon Sep 17 00:00:00 2001 From: Ceyhun Ozugur Date: Fri, 5 Jun 2020 12:45:33 +0200 Subject: [PATCH 11/33] Fix android js bundle asset folder --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index aea1f8caa31e..953922a95bc7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -88,7 +88,7 @@ jobs: - npm-bundle-android - run: name: Ensure assets folder exists - command: mkdir -p libs/gutenberg-mobile/react-native-gutenberg-bridge/android/build/assets + command: mkdir -p libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets - run: name: Move bundle to assets folder command: mv libs/gutenberg-mobile/bundle/android/App.js libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets/index.android.bundle From 137fe783386d4f555fdb5bf95bee75aa1e894a51 Mon Sep 17 00:00:00 2001 From: Ceyhun Ozugur Date: Fri, 5 Jun 2020 13:12:40 +0200 Subject: [PATCH 12/33] Fix rn bridge asset folder path --- .circleci/config.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 953922a95bc7..b2c113a3a33d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -105,9 +105,9 @@ jobs: - restore-gutenberg-bundle-cache - run: name: Ensure assets folder exists - command: mkdir libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets + command: mkdir libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets - attach_workspace: - at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets + at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets - run: name: Test WordPress environment: @@ -132,9 +132,9 @@ jobs: - restore-gutenberg-bundle-cache - run: name: Ensure assets folder exists - command: mkdir libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets + command: mkdir libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets - attach_workspace: - at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets + at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets - run: name: Checkstyle environment: @@ -179,9 +179,9 @@ jobs: - restore-gutenberg-bundle-cache - run: name: Ensure assets folder exists - command: mkdir libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets + command: mkdir libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets - attach_workspace: - at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets + at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets - run: name: Build APK environment: @@ -224,9 +224,9 @@ jobs: - restore-gutenberg-bundle-cache - run: name: Ensure assets folder exists - command: mkdir libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets + command: mkdir libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets - attach_workspace: - at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets + at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets - run: name: Build environment: @@ -267,9 +267,9 @@ jobs: - restore-gutenberg-bundle-cache - run: name: Ensure assets folder exists - command: mkdir libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets + command: mkdir libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets - attach_workspace: - at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets + at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets - run: name: Build environment: From a0b81d6aeca6690effd7f398e555de78ead9b949 Mon Sep 17 00:00:00 2001 From: Ceyhun Ozugur Date: Fri, 5 Jun 2020 13:44:09 +0200 Subject: [PATCH 13/33] Always checkout submodules recursively but shallow --- .circleci/config.yml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b2c113a3a33d..bbd8193a9a16 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,12 +31,7 @@ commands: steps: - run: name: Checkout submodules - command: git submodule update --init --recursive - checkout-gutenberg-mobile-submodule-only: - steps: - - run: - name: Checkout gutenberg-mobile submodule (no recursive) - command: git submodule update --init + command: git submodule update --init --recursive --depth 1 npm-bundle-android: steps: - run: @@ -99,7 +94,7 @@ jobs: api-version: "28" steps: - git/shallow-checkout - - checkout-gutenberg-mobile-submodule-only + - checkout-submodules - android/restore-gradle-cache - copy-gradle-properties - restore-gutenberg-bundle-cache @@ -126,7 +121,7 @@ jobs: api-version: "28" steps: - git/shallow-checkout - - checkout-gutenberg-mobile-submodule-only + - checkout-submodules - android/restore-gradle-cache - copy-gradle-properties - restore-gutenberg-bundle-cache @@ -169,7 +164,7 @@ jobs: api-version: "28" steps: - git/shallow-checkout - - checkout-gutenberg-mobile-submodule-only + - checkout-submodules - bundle-install/bundle-install: cache_key_prefix: installable-build - run: @@ -218,7 +213,7 @@ jobs: api-version: "28" steps: - git/shallow-checkout - - checkout-gutenberg-mobile-submodule-only + - checkout-submodules - android/restore-gradle-cache - copy-gradle-properties - restore-gutenberg-bundle-cache @@ -261,7 +256,7 @@ jobs: api-version: "28" steps: - git/shallow-checkout - - checkout-gutenberg-mobile-submodule-only + - checkout-submodules - android/restore-gradle-cache - copy-gradle-properties - restore-gutenberg-bundle-cache @@ -293,7 +288,7 @@ jobs: - image: circleci/ruby:2.6.4 steps: - git/shallow-checkout - - checkout-gutenberg-mobile-submodule-only + - checkout-submodules - run: name: Install bundler command: gem install bundler --version 2.0.2 From 4edbb246283ea86c792382ed06ff65f4070c2179 Mon Sep 17 00:00:00 2001 From: Ceyhun Ozugur Date: Fri, 5 Jun 2020 14:46:34 +0200 Subject: [PATCH 14/33] Fix lint errors --- WordPress/lint-baseline.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/WordPress/lint-baseline.xml b/WordPress/lint-baseline.xml index 0c05e626cf08..023d9ff9aabc 100644 --- a/WordPress/lint-baseline.xml +++ b/WordPress/lint-baseline.xml @@ -57,7 +57,7 @@ errorLine1=" view.setPadding(" errorLine2=" ^"> @@ -3927,7 +3927,7 @@ errorLine1=" Layout.BREAK_STRATEGY_SIMPLE : Layout.BREAK_STRATEGY_HIGH_QUALITY;" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -3943,7 +3943,7 @@ errorLine1=" Layout.BREAK_STRATEGY_SIMPLE : Layout.BREAK_STRATEGY_HIGH_QUALITY;" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -3959,7 +3959,7 @@ errorLine1=" view.setJustificationMode(Layout.JUSTIFICATION_MODE_INTER_WORD);" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -3975,7 +3975,7 @@ errorLine1=" view.setJustificationMode(Layout.JUSTIFICATION_MODE_NONE);" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> From b8c5400d0558cb26365c5c91618e05753b3e3b16 Mon Sep 17 00:00:00 2001 From: Cameron Voell Date: Sun, 14 Jun 2020 21:55:59 -0700 Subject: [PATCH 15/33] Update gutenberg ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index e6b732eb85b1..7f394fc4c035 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit e6b732eb85b175524df9a8375f5357b4147bc481 +Subproject commit 7f394fc4c0352dc9a37ca4936b7270b691227031 From a2dd90bb3b5d994def4343e8126ab5d3bf83b9b4 Mon Sep 17 00:00:00 2001 From: Cameron Voell Date: Wed, 17 Jun 2020 00:08:11 -0700 Subject: [PATCH 16/33] Update gutenberg ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 7f394fc4c035..869d0ff37e80 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 7f394fc4c0352dc9a37ca4936b7270b691227031 +Subproject commit 869d0ff37e8046fed95484dca11c8f0a1af09f06 From 7c93c28b385bc8504eb9479865b1a0599d549cfe Mon Sep 17 00:00:00 2001 From: Ceyhun Ozugur Date: Wed, 17 Jun 2020 18:30:42 +0200 Subject: [PATCH 17/33] Fix build when wp.BUILD_GUTENBERG_FROM_SOURCE=true --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 455805c1ffb5..069d332eeacd 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,7 @@ allprojects { maven { // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm - url "$rootDir/libs/gutenberg-mobile/node_modules/react-native/android" + url "$rootDir/libs/gutenberg-mobile/gutenberg/node_modules/react-native/android" } } else { maven { url "https://dl.bintray.com/wordpress-mobile/react-native-mirror/" } From 54904ed90f204cd0ab36d33fdf7c163993cc5137 Mon Sep 17 00:00:00 2001 From: Ceyhun Ozugur Date: Thu, 18 Jun 2020 13:26:02 +0200 Subject: [PATCH 18/33] Update gutenberg-mobile ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 869d0ff37e80..31a34ed7f406 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 869d0ff37e8046fed95484dca11c8f0a1af09f06 +Subproject commit 31a34ed7f40664a96a81ce952e91d42d2804c35d From 3a7519790ce3ee0fd104bfab58e5aaf42da179b9 Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Thu, 18 Jun 2020 18:27:23 +0300 Subject: [PATCH 19/33] Bump gb-mobile hash --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 31a34ed7f406..47d1cfc5ee60 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 31a34ed7f40664a96a81ce952e91d42d2804c35d +Subproject commit 47d1cfc5ee60f68797cea37c0e6d59054c177aba From f8a2ce4f3bcce22ca18b4770f3fa649026ceef37 Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Thu, 18 Jun 2020 18:27:39 +0300 Subject: [PATCH 20/33] Resolve the multiple kotlin_module file error Similarly like https://github.com/WordPress/gutenberg/pull/23248/commits/aa3d0ef0052c709fdaca07db96e9ba190895b983 --- WordPress/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index faca61addfe9..63905365011f 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -147,6 +147,9 @@ android { exclude '**/libjscexecutor.so' exclude '**/libhermes-inspector.so' exclude '**/libhermes-executor-debug.so' + + pickFirst 'META-INF/-no-jdk.kotlin_module' + } bundle { From 91a1e2a4983807189577ca0a7d657f4d7de1bd4e Mon Sep 17 00:00:00 2001 From: Cameron Voell Date: Thu, 18 Jun 2020 10:03:10 -0700 Subject: [PATCH 21/33] Updating gutenberg ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 47d1cfc5ee60..81e4828b410a 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 47d1cfc5ee60f68797cea37c0e6d59054c177aba +Subproject commit 81e4828b410a2f1d46ea6f5455a35f04e86154ff From 7459ed0d0d8c4a178b2e0e85dcf2f9f5d7151835 Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Thu, 18 Jun 2020 20:22:30 +0300 Subject: [PATCH 22/33] react-native-recyclerview is not used anymore --- libs/gutenberg-mobile | 2 +- settings.gradle | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 81e4828b410a..ed775af2a116 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 81e4828b410a2f1d46ea6f5455a35f04e86154ff +Subproject commit ed775af2a116a9e44fd4a26bea31d39f9a4852ee diff --git a/settings.gradle b/settings.gradle index 789918cdb0a4..ab82586cd6bf 100644 --- a/settings.gradle +++ b/settings.gradle @@ -22,8 +22,6 @@ if (properties.getOrDefault('wp.BUILD_GUTENBERG_FROM_SOURCE', false).toBoolean() project(':react-native-svg').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/node_modules/react-native-svg/android') include ':react-native-aztec' project(':react-native-aztec').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android') - include ':react-native-recyclerview-list' - project(':react-native-recyclerview-list').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/node_modules/react-native-recyclerview-list/android') include ':react-native-gutenberg-bridge' project(':react-native-gutenberg-bridge').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android') include ':react-native-video' From 6e234e4e7bd16f0f15c8d51ee6d61295acaaf6e7 Mon Sep 17 00:00:00 2001 From: Cameron Voell Date: Thu, 18 Jun 2020 11:40:27 -0700 Subject: [PATCH 23/33] Update gutenberg ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index ed775af2a116..81e4828b410a 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit ed775af2a116a9e44fd4a26bea31d39f9a4852ee +Subproject commit 81e4828b410a2f1d46ea6f5455a35f04e86154ff From 72f07e73cfacf47dd8a51d2adb5565d96bf2b4e8 Mon Sep 17 00:00:00 2001 From: Cameron Voell Date: Thu, 18 Jun 2020 12:12:33 -0700 Subject: [PATCH 24/33] Only mkdir assets if not existing --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bbd8193a9a16..b0981777d1a4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -100,7 +100,7 @@ jobs: - restore-gutenberg-bundle-cache - run: name: Ensure assets folder exists - command: mkdir libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets + command: mkdir -p libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets - attach_workspace: at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets - run: @@ -127,7 +127,7 @@ jobs: - restore-gutenberg-bundle-cache - run: name: Ensure assets folder exists - command: mkdir libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets + command: mkdir -p libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets - attach_workspace: at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets - run: @@ -174,7 +174,7 @@ jobs: - restore-gutenberg-bundle-cache - run: name: Ensure assets folder exists - command: mkdir libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets + command: mkdir -p libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets - attach_workspace: at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets - run: @@ -219,7 +219,7 @@ jobs: - restore-gutenberg-bundle-cache - run: name: Ensure assets folder exists - command: mkdir libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets + command: mkdir -p libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets - attach_workspace: at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets - run: @@ -262,7 +262,7 @@ jobs: - restore-gutenberg-bundle-cache - run: name: Ensure assets folder exists - command: mkdir libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets + command: mkdir -p libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets - attach_workspace: at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets - run: From 18e12b0379e3471be7428a6cd06d274230c68194 Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Fri, 19 Jun 2020 15:29:13 +0300 Subject: [PATCH 25/33] Bump gb-mobile hash --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 81e4828b410a..03c88f0c1980 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 81e4828b410a2f1d46ea6f5455a35f04e86154ff +Subproject commit 03c88f0c19805a1639ca62e36c88281505ccccd5 From df19ea106f4e6b5751be3ade3f59cff87bee3ce5 Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Fri, 19 Jun 2020 16:55:27 +0300 Subject: [PATCH 26/33] Bump gb-mobile hash --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 03c88f0c1980..51d42e8ceb9c 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 03c88f0c19805a1639ca62e36c88281505ccccd5 +Subproject commit 51d42e8ceb9c14efb9e4a1ed7cfd72f460305d77 From d7d57f9cbf7cde9a2fa5a89f5ca8bc9c12afa9f9 Mon Sep 17 00:00:00 2001 From: Ceyhun Ozugur Date: Fri, 19 Jun 2020 18:57:47 +0200 Subject: [PATCH 27/33] Update gutenberg-mobile ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 51d42e8ceb9c..735a7058a4be 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 51d42e8ceb9c14efb9e4a1ed7cfd72f460305d77 +Subproject commit 735a7058a4beb42f31f48873d3600bdfa43464ca From e0c2c8e40365768bc96caa36485bd7eed519413b Mon Sep 17 00:00:00 2001 From: Matt Chowning Date: Tue, 23 Jun 2020 16:31:45 -0400 Subject: [PATCH 28/33] Update gutenberg submodule ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 735a7058a4be..41f12f65649b 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 735a7058a4beb42f31f48873d3600bdfa43464ca +Subproject commit 41f12f65649bb86ffa3de2ebb0046a96065e18ee From c7db82a9eb0f10151157a9082aca6ee3c2429d6a Mon Sep 17 00:00:00 2001 From: Matt Chowning Date: Tue, 23 Jun 2020 17:31:53 -0400 Subject: [PATCH 29/33] Updates from running tools/merge_strings_xml.py script --- WordPress/src/main/res/values/strings.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml index 9f95ed410c4c..4c785a556a48 100644 --- a/WordPress/src/main/res/values/strings.xml +++ b/WordPress/src/main/res/values/strings.xml @@ -2874,6 +2874,7 @@ Current value is %s CUSTOMIZE + Customize Gradient Dismiss Don’t cry because it’s over, smile because it happened. @@ -2896,6 +2897,8 @@ Double tap to select a video Double tap to select an image Double tap to select layout + + Double tap to select the option Double tap to toggle setting Double tap to undo last change @@ -2916,6 +2919,8 @@ translators: sample content for "Portfolio" page template translators: sample content for "Services" page template translators: sample content for "Team" page template --> Get in Touch + Go back + Gradient Type Help icon Here is the panel content! Hide keyboard @@ -2965,10 +2970,14 @@ translators: sample content for "Services" page template --> My post status info My pre publish panel Navigate Up + Navigates to custom color picker + Navigates to customize the gradient + Navigates to the previous content sheet No application can handle this request. Please install a Web browser. Number of columns Only show excerpt Open Block Actions Menu + Open link in a browser Open Settings Page break block. %s From 650c1ca445fe5c48693f6f9cfe4ec69683431ee3 Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Wed, 24 Jun 2020 11:31:20 +0300 Subject: [PATCH 30/33] checkout-gutenberg-mobile-submodule-only is no more --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e2660b342326..8b92af7504fa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -313,7 +313,7 @@ jobs: APP_VERSION_PREFIX: << pipeline.parameters.translation_review_lang_id >> steps: - git/shallow-checkout - - checkout-gutenberg-mobile-submodule-only + - checkout-submodules - bundle-install/bundle-install: cache_key_prefix: installable-build - run: From 30b7790ddb55bc45d2eee40fb3dd28e9bd46c37a Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Fri, 26 Jun 2020 10:31:48 +0100 Subject: [PATCH 31/33] Remove space on release notes. --- RELEASE-NOTES.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 584b610a7d82..692b4987ec24 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,7 +1,6 @@ 15.2 ----- * [**] Fixes tons of rendering issues in Reader post detail by changing the technical solution (shared CSS file). - * [**] Block editor: Display content metrics information (blocks, words, characters count). * [**] Block Editor: Adds editor support for theme defined colors and theme defined gradients on cover and button blocks. * [**] Block Editor: Add support allowing Cover Block video uploads to complete after the editor has closed From 834f1fbdd52f5b22ceaa98940c2a44ca990ee928 Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Fri, 26 Jun 2020 10:32:51 +0100 Subject: [PATCH 32/33] Update GB reference. --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 41f12f65649b..6c02bd0dc6f3 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 41f12f65649bb86ffa3de2ebb0046a96065e18ee +Subproject commit 6c02bd0dc6f35c073ad665fd57dfeff3b5e3f28c From 4fe7f1612a61b25ffed735a5276299934a7079d3 Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Fri, 26 Jun 2020 13:43:20 +0100 Subject: [PATCH 33/33] Update GB reference to official tag v1.31.0 --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 6c02bd0dc6f3..e9a657960994 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 6c02bd0dc6f35c073ad665fd57dfeff3b5e3f28c +Subproject commit e9a657960994994abcdb1923a3717da59f3b03f2