From 01b33ad314ec8d9be3d45ceaed1d2fbbea475a32 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Tue, 5 Feb 2019 21:55:23 -0800 Subject: [PATCH] android notif: Remove wix library from the (Android) build. Fixes #2877. Take the library out of our Android build config; and remove all the bits of cruft in our manifest that are there to override what it wants to put there. --- android/app/build.gradle | 1 - android/app/src/main/AndroidManifest.xml | 8 +------- android/settings.gradle | 2 -- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 20f0841db12..946c2f8ce72 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -177,7 +177,6 @@ repositories { dependencies { implementation project(':react-native-text-input-reset') - implementation project(':react-native-notifications') implementation project(':react-native-image-picker') implementation project(':react-native-orientation') implementation project(':react-native-sentry') diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 8f3c38abc42..c2a72f9ca57 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -15,8 +15,7 @@ - + - @@ -79,7 +76,6 @@ - - - diff --git a/android/settings.gradle b/android/settings.gradle index 4a51e265d3b..5b47724a497 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,8 +1,6 @@ rootProject.name = 'ZulipMobile' include ':react-native-text-input-reset' project(':react-native-text-input-reset').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-text-input-reset/android') -include ':react-native-notifications' -project(':react-native-notifications').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-notifications/android') include ':react-native-image-picker' project(':react-native-image-picker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-image-picker/android') include ':react-native-orientation'