diff --git a/.eslintignore b/.eslintignore index 0e9bd3abe9..efeb1de18d 100644 --- a/.eslintignore +++ b/.eslintignore @@ -3,4 +3,4 @@ gutenberg symlinked-packages-in-parent react-native-aztec bundle - +react-native-aztec-old-submodule diff --git a/.gitmodules b/.gitmodules index e0461622a7..062b5e5a05 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "gutenberg"] path = gutenberg url = ../../WordPress/gutenberg.git +[submodule "react-native-aztec"] + path = react-native-aztec-old-submodule + url = ../react-native-aztec.git diff --git a/jest.config.js b/jest.config.js index e13c73f258..83e62e3ca4 100644 --- a/jest.config.js +++ b/jest.config.js @@ -23,7 +23,7 @@ module.exports = { '/gutenberg/packages/', ], testURL: 'http://localhost/', - modulePathIgnorePatterns: [ '/gutenberg/gutenberg-mobile' ], + modulePathIgnorePatterns: [ '/gutenberg/gutenberg-mobile', 'react-native-aztec-old-submodule' ], moduleDirectories: [ 'node_modules', 'symlinked-packages' ], moduleNameMapper: { // Mock the CSS modules. See https://facebook.github.io/jest/docs/en/webpack.html#handling-static-assets diff --git a/jitpack.yml b/jitpack.yml index 6270d6feb8..b422439ad9 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,3 +1,6 @@ +before_install: + - yes | $ANDROID_HOME/tools/bin/sdkmanager "platforms;android-27" + - yes | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;27.0.3" install: - echo "Changing into the android folder of the Bridge module" - pushd react-native-gutenberg-bridge/android && ./gradlew --stacktrace clean -Pgroup=com.github.wordpress-mobile.gutenberg-mobile -Pversion=$VERSION install && popd diff --git a/react-native-aztec-old-submodule b/react-native-aztec-old-submodule new file mode 160000 index 0000000000..fe8e53ac57 --- /dev/null +++ b/react-native-aztec-old-submodule @@ -0,0 +1 @@ +Subproject commit fe8e53ac57230129655434705d22a9ed79ecfc97 diff --git a/rn-cli.config.js b/rn-cli.config.js index 962a5c6800..c141ce3095 100644 --- a/rn-cli.config.js +++ b/rn-cli.config.js @@ -3,7 +3,10 @@ const path = require( 'path' ); const blacklist = require( 'metro-config/src/defaults/blacklist' ); // Blacklist the nested GB filetree so modules are not resolved in duplicates, // both in the nested directory and the parent directory. -const blacklistElements = blacklist( [ new RegExp( path.basename( __dirname ) + '/gutenberg/gutenberg-mobile/.*' ) ] ); +const blacklistElements = blacklist( [ + new RegExp( path.basename( __dirname ) + '/gutenberg/gutenberg-mobile/.*' ), + new RegExp( path.basename( __dirname ) + '/react-native-aztec-old-submodule/.*' ), +] ); const enm = require( './extra-node-modules.config.js' ); module.exports = {