GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-11-23 20:49:26 +01:00
Code Issues Projects Releases Wiki Activity

chore: Disable google-services by default

Browse Source
This commit is contained in:
Krille Fear 2021-09-24 12:19:02 +02:00
parent a519247457
commit 01720a2b83
4 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/app/build.gradle
View File

@ -88,6 +88,4 @@ dependencies {
implementation 'com.github.UnifiedPush:android-connector:1.2.0' // needed for unifiedpush 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'
}

2
android/build.gradle
View File

@ -8,7 +8,7 @@ buildscript {
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.2.1' classpath 'com.android.tools.build:gradle:4.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" 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'
} }
} }

23
scripts/enable-android-google-services.patch Normal file
View File

@ -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'
}
}

1
scripts/prepare-android-release.sh
View File

@ -1,4 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
git apply ./scripts/enable-android-google-services.patch
cd android cd android
echo $FDROID_KEY | base64 --decode --ignore-garbage > key.jks echo $FDROID_KEY | base64 --decode --ignore-garbage > key.jks
echo "storePassword=${FDROID_KEY_PASS}" >> key.properties echo "storePassword=${FDROID_KEY_PASS}" >> key.properties