diff --git a/.eslintignore b/.eslintignore index 7b03f0840b..31b736e524 100644 --- a/.eslintignore +++ b/.eslintignore @@ -4,4 +4,3 @@ symlinked-packages symlinked-packages-in-parent react-native-aztec bundle -react-native-aztec-old-submodule diff --git a/.gitmodules b/.gitmodules index 062b5e5a05..e0461622a7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [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 3d5cadf9fa..efe963ebd2 100644 --- a/jest.config.js +++ b/jest.config.js @@ -33,10 +33,7 @@ module.exports = { '/__device-tests__/', ], testURL: 'http://localhost/', - modulePathIgnorePatterns: [ - '/gutenberg/gutenberg-mobile', - 'react-native-aztec-old-submodule', - ], + modulePathIgnorePatterns: [ '/gutenberg/gutenberg-mobile' ], 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 e3ac4a59b3..d8c5aaf051 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,5 +1,7 @@ install: - export TMPDIR=`dirname $(mktemp)` + - echo "Removing react-native-aztec-old-submodule folder" + - rm -rf react-native-aztec-old-submodule - 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 - pushd react-native-aztec/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 deleted file mode 160000 index fe8e53ac57..0000000000 --- a/react-native-aztec-old-submodule +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fe8e53ac57230129655434705d22a9ed79ecfc97 diff --git a/rn-cli.config.js b/rn-cli.config.js index 1573268b05..25d3623f8d 100644 --- a/rn-cli.config.js +++ b/rn-cli.config.js @@ -6,7 +6,6 @@ const blacklist = require( 'metro-config/src/defaults/blacklist' ); const blacklistElements = blacklist( [ new RegExp( path.basename( __dirname ) + '/gutenberg/node_modules/.*' ), 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' );