Merge 2610e6aff6 into fd97fc7fef

.github/workflows/build_apk.yml

@@ -100,10 +100,8 @@ jobs:
       - name: Restore google-services.json
         run: bash .github/scripts/restore_from_base64.sh "${{ secrets.GOOGLE_SERVICES_JSON_ANDROID }}" "android/app/google-services.json"
 
-      - name: Setup Firebase
-        run: |
-          bash .github/scripts/restore_from_base64.sh "${{ secrets.FIREBASE_OPTIONS }}" "lib/firebase_options.dart"
-          bash .github/scripts/restore_from_base64.sh "${{ secrets.FIREBASE_JSON }}" "firebase.json"
+      - name: Restore firebase_options.dart
+        run: bash .github/scripts/restore_from_base64.sh "${{ secrets.FIREBASE_OPTIONS }}" "lib/firebase_options.dart"
 
       - name: Restore constants.dart
         env:

.github/workflows/build_ipa.yml

@@ -92,11 +92,11 @@ jobs:
       - name: Restore ExportOptions.plist
         run: bash .github/scripts/restore_from_base64.sh "${{ secrets.APP_STORE_EXPORT_OPTIONS }}" "ios/Runner/ExportOptions.plist"
 
-      - name: Setup Firebase
-        run: |
-          bash .github/scripts/restore_from_base64.sh "${{ secrets.FIREBASE_APP_ID_FILE }}" "ios/firebase_app_id_file.json"
-          bash .github/scripts/restore_from_base64.sh "${{ secrets.FIREBASE_OPTIONS }}" "lib/firebase_options.dart"
-          bash .github/scripts/restore_from_base64.sh "${{ secrets.FIREBASE_JSON }}" "firebase.json"
+      - name: Restore firebase_app_id_file.json
+        run: bash .github/scripts/restore_from_base64.sh "${{ secrets.FIREBASE_APP_ID_FILE }}" "ios/firebase_app_id_file.json"
+
+      - name: Restore firebase_options.dart
+        run: bash .github/scripts/restore_from_base64.sh "${{ secrets.FIREBASE_OPTIONS }}" "lib/firebase_options.dart"
 
       - name: Restore constants.dart
         env:

.gitignore

@@ -64,6 +64,4 @@ ios/Runner/GoogleService-Info.plist
 coverage/
 test/coverage_helper_test.dart
 **/failures/*.png
-screenshots/generated/raw/
-
-firebase.json
+screenshots/generated/raw/