diff --git a/android/app/build.gradle b/android/app/build.gradle index 57bbd1cf5..06a9ab1a7 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -88,6 +88,4 @@ dependencies { implementation 'com.github.UnifiedPush:android-connector:1.2.0' // needed for unifiedpush } -if(file("google-services.json").exists()){ - apply plugin: 'com.google.gms.google-services' -} +//apply plugin: 'com.google.gms.google-services' diff --git a/android/build.gradle b/android/build.gradle index be58d662e..4ce5c41d8 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -8,7 +8,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:4.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.google.gms:google-services:4.3.8' + //classpath 'com.google.gms:google-services:4.3.8' } } diff --git a/scripts/enable-android-google-services.patch b/scripts/enable-android-google-services.patch new file mode 100644 index 000000000..034312b49 --- /dev/null +++ b/scripts/enable-android-google-services.patch @@ -0,0 +1,23 @@ +diff --git a/android/app/build.gradle b/android/app/build.gradle +index 06a9ab1a..780e0011 100644 +--- a/android/app/build.gradle ++++ b/android/app/build.gradle +@@ -88,4 +88,4 @@ dependencies { + implementation 'com.github.UnifiedPush:android-connector:1.2.0' // needed for unifiedpush + } + +-//apply plugin: 'com.google.gms.google-services' ++apply plugin: 'com.google.gms.google-services' +diff --git a/android/build.gradle b/android/build.gradle +index 4ce5c41d..be58d662 100644 +--- a/android/build.gradle ++++ b/android/build.gradle +@@ -8,7 +8,7 @@ buildscript { + dependencies { + classpath 'com.android.tools.build:gradle:4.2.1' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" +- //classpath 'com.google.gms:google-services:4.3.8' ++ classpath 'com.google.gms:google-services:4.3.8' + } + } + diff --git a/scripts/prepare-android-release.sh b/scripts/prepare-android-release.sh index a2a11dcb1..8204f7ca1 100755 --- a/scripts/prepare-android-release.sh +++ b/scripts/prepare-android-release.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +git apply ./scripts/enable-android-google-services.patch cd android echo $FDROID_KEY | base64 --decode --ignore-garbage > key.jks echo "storePassword=${FDROID_KEY_PASS}" >> key.properties