From eaa09cbf6697a0b47f2e312a36aafe616bc86395 Mon Sep 17 00:00:00 2001 From: Joseph Baylon Date: Mon, 29 Aug 2022 12:59:19 -0700 Subject: [PATCH] Gekidou: Create patches for node modules failing on android build (#6603) * Gekidou: Create patches for node modules failing on android build * Trim unnecessary data from patch --- patches/jail-monkey+2.7.0.patch | 21 +++++++++++++++++++ ...react-native-hw-keyboard-event+0.0.4.patch | 14 +++++++++---- 2 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 patches/jail-monkey+2.7.0.patch diff --git a/patches/jail-monkey+2.7.0.patch b/patches/jail-monkey+2.7.0.patch new file mode 100644 index 0000000000..951d43b4c9 --- /dev/null +++ b/patches/jail-monkey+2.7.0.patch @@ -0,0 +1,21 @@ +diff --git a/node_modules/jail-monkey/android/build.gradle b/node_modules/jail-monkey/android/build.gradle +index 2a7a12e..27b1b66 100644 +--- a/node_modules/jail-monkey/android/build.gradle ++++ b/node_modules/jail-monkey/android/build.gradle +@@ -1,12 +1,12 @@ + apply plugin: 'com.android.library' + + android { +- compileSdkVersion 28 +- buildToolsVersion "28.0.3" ++ compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : 28 ++ buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : "28.0.3" + + defaultConfig { +- minSdkVersion 21 +- targetSdkVersion 28 ++ minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.minSdkVersion : 21 ++ targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : 28 + versionCode 1 + versionName "1.0" + } diff --git a/patches/react-native-hw-keyboard-event+0.0.4.patch b/patches/react-native-hw-keyboard-event+0.0.4.patch index f3dd3b5a22..7562e6a982 100644 --- a/patches/react-native-hw-keyboard-event+0.0.4.patch +++ b/patches/react-native-hw-keyboard-event+0.0.4.patch @@ -1,16 +1,22 @@ diff --git a/node_modules/react-native-hw-keyboard-event/android/build.gradle b/node_modules/react-native-hw-keyboard-event/android/build.gradle -index a70aace..6443899 100644 +index a70aace..9c2c876 100644 --- a/node_modules/react-native-hw-keyboard-event/android/build.gradle +++ b/node_modules/react-native-hw-keyboard-event/android/build.gradle -@@ -4,7 +4,7 @@ android { - compileSdkVersion 28 +@@ -1,11 +1,11 @@ + apply plugin: 'com.android.library' + + android { +- compileSdkVersion 28 ++ compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : 28 defaultConfig { - minSdkVersion 16 +- targetSdkVersion 28 + minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.minSdkVersion : 21 - targetSdkVersion 28 ++ targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : 28 versionCode 1 versionName "1.0" + ndk { diff --git a/node_modules/react-native-hw-keyboard-event/index.d.ts b/node_modules/react-native-hw-keyboard-event/index.d.ts index 91999f1..116b725 100644 --- a/node_modules/react-native-hw-keyboard-event/index.d.ts