diff --git a/.gitmodules b/.gitmodules index 924ff9bb06a4..6563980f32a8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "libs/gutenberg-mobile"] path = libs/gutenberg-mobile - url = ../../wordpress-mobile/gutenberg-mobile.git + url = git@github.com:callstack/gutenberg.git diff --git a/libs/editor/WordPressEditor/build.gradle b/libs/editor/WordPressEditor/build.gradle index 3767ac8b5566..39861cee7824 100644 --- a/libs/editor/WordPressEditor/build.gradle +++ b/libs/editor/WordPressEditor/build.gradle @@ -79,7 +79,7 @@ dependencies { api ("com.github.wordpress-mobile.WordPress-Aztec-Android:wordpress-comments:$aztecVersion") if (rootProject.ext.has("buildGutenbergFromSource") && rootProject.ext.buildGutenbergFromSource) { - implementation (project(':react-native-gutenberg-bridge')) { + implementation (project(':react-native-bridge')) { exclude group: 'com.squareup.okhttp3' exclude group: "com.android.volley" exclude group: 'com.google.code.findbugs' diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index faf94601ba77..cdadddd3fafd 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit faf94601ba77958ea62840849f7673ea01643d03 +Subproject commit cdadddd3fafdd997838caf2e4d677142eeef00c6 diff --git a/settings.gradle b/settings.gradle index 27908d34c024..7634b3282149 100644 --- a/settings.gradle +++ b/settings.gradle @@ -12,11 +12,11 @@ if (properties.getOrDefault('wp.BUILD_GUTENBERG_FROM_SOURCE', false).toBoolean() 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' - 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/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') - include ':react-native-gutenberg-bridge' - project(':react-native-gutenberg-bridge').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/react-native-gutenberg-bridge/android') + include ':react-native-bridge' + project(':react-native-bridge').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/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') }