From 4e92f449b4a9bfe14a6af3e6d49fa4dda5eb7e80 Mon Sep 17 00:00:00 2001
From: Vlad <vlad@lumbermandesigns.com>
Date: Thu, 12 Aug 2021 23:32:59 -0300
Subject: [PATCH] Fix broken Android build process (#668)

* Better debugging and redirect on invite creation (#659)

* Fix Broken YouTube videos playback (#667)

* Fix broken Android build
---
 android/app/build.gradle  | 8 +++++++-
 android/build.gradle      | 5 +++--
 android/gradle.properties | 2 ++
 package.json              | 2 +-
 yarn.lock                 | 8 ++++----
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 9958dd03a..544be42ad 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -143,11 +143,15 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         vectorDrawables.useSupportLibrary = true
-        versionCode grgit.log(includes:['HEAD']).size() + 1000
+        // versionCode grgit.log(includes:['HEAD']).size() + 1000
+        versionCode 8000 // Update on release
         versionName "5.6.9"
         multiDexEnabled true
         testBuildType System.getProperty('testBuildType', 'debug')  // This will later be used to control the test apk build type
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+        dexOptions {
+            javaMaxHeapSize "4g"
+        }
     }
 
     splits {
@@ -222,6 +226,8 @@ dependencies {
     implementation 'com.google.firebase:firebase-crashlytics:17.3.0'
     implementation 'com.android.support:multidex:2.0.1' // https://medium.com/@jQN/react-native-multidex-error-8f9a1daf8c34
 
+    implementation 'com.google.firebase:firebase-messaging:21.1.0'
+
     if (enableHermes) {
         def hermesPath = "../../node_modules/hermes-engine/android/";
         debugImplementation files(hermesPath + "hermes-debug.aar")
diff --git a/android/build.gradle b/android/build.gradle
index 65b58ec6c..ecbf5b8e8 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -33,8 +33,9 @@ buildscript {
 }
 
 // Voke: Fastline Travis
-apply plugin: 'org.ajoberstar.grgit'
-ext.grgit = org.ajoberstar.grgit.Grgit.open()
+// August 2021 - NOT WORKING ANYMORE
+// apply plugin: 'org.ajoberstar.grgit'
+// ext.grgit = org.ajoberstar.grgit.Grgit.open()
 
 allprojects {
     repositories {
diff --git a/android/gradle.properties b/android/gradle.properties
index 962ec1d7a..fc488aa24 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -26,3 +26,5 @@ android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
 FLIPPER_VERSION=0.85.0
+
+firebaseMessagingVersion=21.1.0
diff --git a/package.json b/package.json
index d0bd99de3..690a679d5 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
     "react-native-orientation-locker": "wonday/react-native-orientation-locker#master",
     "react-native-permissions": "^3.0.0",
     "react-native-portalize": "^1.0.7",
-    "react-native-push-notification": "^6.1.3",
+    "react-native-push-notification": "^7.4.0",
     "react-native-reanimated": "^1.13.2",
     "react-native-safe-area-context": "^3.1.9",
     "react-native-scalable-image": "^1.1.0",
diff --git a/yarn.lock b/yarn.lock
index 9962dfc6b..efcfed28d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7050,10 +7050,10 @@ react-native-portalize@^1.0.7:
   resolved "https://registry.yarnpkg.com/react-native-portalize/-/react-native-portalize-1.0.7.tgz#8b3c742a06f863654d526ea1075a8596625f8482"
   integrity sha512-icqopPh9ZSV+I8C5LlZN9pQJ0OMeBDNqHhP80+qDx0hOGEcsDC09wgjogbEMfJE0GcMDM7PDYtyQkqa9gIqd1g==
 
-react-native-push-notification@^6.1.3:
-  version "6.1.3"
-  resolved "https://registry.yarnpkg.com/react-native-push-notification/-/react-native-push-notification-6.1.3.tgz#e377e91fc931d541f23b3a156f3451bae5f441a2"
-  integrity sha512-qNbFCkObCXwSFQbK6hJyx1Bym1D7V4XM8iN2L6eL3GAdNLmeBTdLdx3mPbKJtuaDJ1+deniFTQ2rz6hU4ELOXA==
+react-native-push-notification@^7.4.0:
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/react-native-push-notification/-/react-native-push-notification-7.4.0.tgz#81192356eddfee8eeaf72a9a696c7c90bf5b0ece"
+  integrity sha512-Ac3Ep71e2D8Q/Vy0OHBAO5JwhsFsNSuf9knkpXQWS0B9488nIZJLEMuTpF8610xPvGw7XxVrL/q0oZO5F1pOzw==
 
 react-native-reanimated@^1.13.2, react-native-reanimated@^1.9.0:
   version "1.13.3"