From a2e5b489154d1fc1c0730e2ae1a0a8b4e46c725f Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Thu, 7 Jan 2021 14:52:25 +0200 Subject: [PATCH] fix merge issues --- android/app/build.gradle | 2 +- android/gradle.properties | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 54ea9373..369cb30a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -74,7 +74,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "com.google.firebase:firebase-messaging:20.3.0" implementation 'pub.devrel:easypermissions:0.4.0' - implementation 'com.google.firebase:firebase-inappmessaging-display:17.2.0' + // implementation 'com.google.firebase:firebase-inappmessaging-display:17.2.0' implementation 'com.google.guava:guava:27.0.1-android' // Dependency on local binaries implementation fileTree(dir: 'libs', include: ['*.jar']) diff --git a/android/gradle.properties b/android/gradle.properties index 9c0729c9..38c8d454 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,5 +1,4 @@ - +org.gradle.jvmargs=-Xmx1536M android.enableR8=true android.useAndroidX=true android.enableJetifier=true -org.gradle.jvmargs=-Xmx4608m