From e2604e03837413872fb87562d81e725d848fdb7a Mon Sep 17 00:00:00 2001 From: lukewalczak Date: Thu, 6 Feb 2020 14:32:47 +0100 Subject: [PATCH 1/4] Revert other files --- settings.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/settings.gradle b/settings.gradle index 3c013b9874e2..f96e02d86463 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,6 +9,8 @@ include ':WordPressMocks' project(':WordPressMocks').projectDir = new File(rootProject.projectDir, properties.getOrDefault('wp.wordpress_mocks_path', 'libs/mocks') + '/WordPressMocks') 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') include ':react-native-svg' project(':react-native-svg').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/node_modules/react-native-svg/android') include ':react-native-aztec' From 87e5179c1e1ea4f385f48a84b16d3beea41274d4 Mon Sep 17 00:00:00 2001 From: lukewalczak Date: Thu, 6 Feb 2020 14:34:14 +0100 Subject: [PATCH 2/4] Update ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index b0f517b188df..cfadd2d15584 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit b0f517b188df7368e91318537d442c3344736200 +Subproject commit cfadd2d1558431a1668ba1364d4582878f79e035 From 121bb8d663f440da4fda3c1063e58ee472630fc0 Mon Sep 17 00:00:00 2001 From: lukewalczak Date: Thu, 6 Feb 2020 16:51:49 +0100 Subject: [PATCH 3/4] Update ref to point to gutenberg-mobile master --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index cfadd2d15584..3a22f087e454 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit cfadd2d1558431a1668ba1364d4582878f79e035 +Subproject commit 3a22f087e454ff0d96e9d8a822ae44e92c4041ea From 3dc3f1bd7bcf5d6468fc1adc5881bfc3d49f877a Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Tue, 11 Feb 2020 13:01:05 +0200 Subject: [PATCH 4/4] Point to gb-mobile develop with v1.22 merged --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 3a22f087e454..40171a1cf7f3 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 3a22f087e454ff0d96e9d8a822ae44e92c4041ea +Subproject commit 40171a1cf7f38685d7e625bbd3b6044b7484734c