chore: remove google-services.json

Signed-off-by: qwq233 <qwq233@qwq2333.top>
qwq233 · Aug 15, 2024 · fae70c3 · fae70c3
1 parent 4b26216
commit fae70c3
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 103 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -75,6 +75,9 @@ jobs:
           cat > service_account_credentials.json << EOF
           ${{ secrets.ANDROID_PUBLISHER_CREDENTIALS }}"
           EOF
+          cat > TMessagesProj/google-services.json << EOF
+          ${{ secrets.GOOGLE_SERVICES_JSON }}"
+          EOF
           ./gradlew :TMessagesProj:assembleRelease :TMessagesProj:uploadCrashlyticsSymbolFileRelease
           echo "APK_FILE=$(find TMessagesProj/build/outputs/apk -name '*arm64*.apk')" >> $GITHUB_ENV
           echo "APK_FILE_ARMV7=$(find TMessagesProj/build/outputs/apk -name '*arm32*.apk')" >> $GITHUB_ENV
@@ -159,6 +162,9 @@ jobs:
           cat > service_account_credentials.json << EOF
           ${{ secrets.ANDROID_PUBLISHER_CREDENTIALS }}"
           EOF
+          cat > TMessagesProj/google-services.json << EOF
+          ${{ secrets.GOOGLE_SERVICES_JSON }}"
+          EOF
           ./gradlew :TMessagesProj:publishPlayBundle
 
 

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -71,7 +71,7 @@ jobs:
       - name: Debug Build
         run: |
           sed '/signingConfig =/d' TMessagesProj/build.gradle.kts > TMessagesProj/build.gradle.kts.tmp
-          cp TMessagesProj/build.gradle.kts.tmp TMessagesProj/build.gradle.kts
+          sed '/google.services/d' TMessagesProj/build.gradle.kts.tmp > TMessagesProj/build.gradle.kts
           ./gradlew TMessagesProj:assembleDebug
         
 

diff --git a/.gitignore b/.gitignore
@@ -3,8 +3,6 @@
 .kotlin/
 build/
 obj/
-TMessagesProj/.cxx
-TMessagesProj/.cargo
 *.iml
 local.properties
 service_account_credentials.json

diff --git a/TMessagesProj/.gitignore b/TMessagesProj/.gitignore
@@ -0,0 +1,4 @@
+.cxx
+.cargo
+.gradle
+google-services.json
diff --git a/TMessagesProj/build.gradle.kts b/TMessagesProj/build.gradle.kts
@@ -30,7 +30,7 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.firebase.crashlytics)
-    alias(libs.plugins.google.services)
+//    alias(libs.plugins.google.services)
     alias(libs.plugins.triplet.play)
     alias(libs.plugins.aboutlibraries)
     alias(libs.plugins.serialization)

diff --git a/TMessagesProj/google-services.json b/TMessagesProj/google-services.json
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -23,7 +23,7 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.firebase.crashlytics) apply false
-    alias(libs.plugins.google.services) apply false
+//    alias(libs.plugins.google.services) apply false
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.jvm) apply false
     alias(libs.plugins.serialization) apply false