From c972d0d89a54017f939b1204dfbbf12bff8d44a9 Mon Sep 17 00:00:00 2001
From: Ceyhun Ozugur <ceyhunozugur@gmail.com>
Date: Thu, 6 Feb 2020 12:42:38 +0100
Subject: [PATCH 1/4] Remove react-native-aztec-old-submodule
---
.eslintignore | 1 -
.gitmodules | 3 ---
jest.config.js | 5 +----
react-native-aztec-old-submodule | 1 -
rn-cli.config.js | 1 -
5 files changed, 1 insertion(+), 10 deletions(-)
delete mode 160000 react-native-aztec-old-submodule
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: [
- '<rootDir>/gutenberg/gutenberg-mobile',
- 'react-native-aztec-old-submodule',
- ],
+ modulePathIgnorePatterns: [ '<rootDir>/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/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' );
From 28782d391abfcd31df37a7b7e91e675c4e526c40 Mon Sep 17 00:00:00 2001
From: Ceyhun Ozugur <ceyhunozugur@gmail.com>
Date: Thu, 13 Feb 2020 12:14:38 +0100
Subject: [PATCH 2/4] Add Jitpack step to remove
react-native-aztec-old-submodule folder
---
react-native-gutenberg-bridge/android/build.gradle | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/react-native-gutenberg-bridge/android/build.gradle b/react-native-gutenberg-bridge/android/build.gradle
index 60eaf7a43c..cfb189d7ee 100644
--- a/react-native-gutenberg-bridge/android/build.gradle
+++ b/react-native-gutenberg-bridge/android/build.gradle
@@ -157,6 +157,10 @@ if (isJitPack) {
def assetsFolder = 'src/main/assets'
def aarFolder = 'src/main/assets'
+ task removeReactNativeAztecOldSubmodule(type: Delete) {
+ delete '../../react-native-aztec-old-submodule'
+ }
+
task buildJSBundle(type: YarnTask) {
args = ['bundle:android']
}
@@ -210,5 +214,6 @@ if (isJitPack) {
backupHermesReleaseAAR.dependsOn(copyJSBundle)
copyJSBundle.dependsOn(buildJSBundle)
buildJSBundle.dependsOn(yarn_install, ensureAssetsDirectory)
+ ensureAssetsDirectory.dependsOn(removeReactNativeAztecOldSubmodule)
}
}
From 7fc0552fdb964da614404e2da296d07f245df260 Mon Sep 17 00:00:00 2001
From: Ceyhun Ozugur <ceyhunozugur@gmail.com>
Date: Thu, 13 Feb 2020 14:50:48 +0100
Subject: [PATCH 3/4] Revert "Add Jitpack step to remove
react-native-aztec-old-submodule folder"
This reverts commit 28782d391abfcd31df37a7b7e91e675c4e526c40.
---
react-native-gutenberg-bridge/android/build.gradle | 5 -----
1 file changed, 5 deletions(-)
diff --git a/react-native-gutenberg-bridge/android/build.gradle b/react-native-gutenberg-bridge/android/build.gradle
index cfb189d7ee..60eaf7a43c 100644
--- a/react-native-gutenberg-bridge/android/build.gradle
+++ b/react-native-gutenberg-bridge/android/build.gradle
@@ -157,10 +157,6 @@ if (isJitPack) {
def assetsFolder = 'src/main/assets'
def aarFolder = 'src/main/assets'
- task removeReactNativeAztecOldSubmodule(type: Delete) {
- delete '../../react-native-aztec-old-submodule'
- }
-
task buildJSBundle(type: YarnTask) {
args = ['bundle:android']
}
@@ -214,6 +210,5 @@ if (isJitPack) {
backupHermesReleaseAAR.dependsOn(copyJSBundle)
copyJSBundle.dependsOn(buildJSBundle)
buildJSBundle.dependsOn(yarn_install, ensureAssetsDirectory)
- ensureAssetsDirectory.dependsOn(removeReactNativeAztecOldSubmodule)
}
}
From e85de8b498992f33c7d8ce1dd0f22ae7d11ccb38 Mon Sep 17 00:00:00 2001
From: Ceyhun Ozugur <ceyhunozugur@gmail.com>
Date: Thu, 13 Feb 2020 15:32:43 +0100
Subject: [PATCH 4/4] Add step to Jitpack config removing
react-native-aztec-old-submodule
---
jitpack.yml | 2 ++
1 file changed, 2 insertions(+)
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