1. bump firebase deps;

2. skip google-services.json and keystore.properties for local dev and CI test.
kid1412621 · May 7, 2024 · 5a60267 · 5a60267
1 parent e80b2e1
commit 5a60267
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 67 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,6 +5,9 @@ on:
     tags:
       - '*'
 
+env:
+  PROD_RELEASE_CI: true
+
 jobs:
   build_release_github:
     environment: production

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,25 +19,5 @@ jobs:
           cache: gradle
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
-      - name: Generate fake google-services.json
-        run: |
-          cat << EOF > app/google-services.json
-          {
-            "project_info": {
-              "project_number": "0",
-              "project_id": "id",
-              "storage_bucket": "bucket"
-            },
-            "client": [
-              {
-                "client_info": {
-                  "mobilesdk_app_id": "app-id",
-                  "android_client_info": { "package_name": "me.nanova.subspace" }
-                },
-                "api_key": [{"current_key": "key"}]
-              }
-            ]
-          }
-          EOF
       - name: Run unit tests
         run: ./gradlew test --no-daemon
diff --git a/README.md b/README.md
@@ -1,37 +1 @@
 [![Test](https://github.com/kid1412621/subspace/actions/workflows/test.yml/badge.svg)](https://github.com/kid1412621/subspace/actions/workflows/test.yml)
-
-# Project setup
-
-1. Add a dummy google-services.json to app directory:
-
-```bash
-cat << EOF > app/google-services.json
-{
-  "project_info": {
-    "project_number": "0",
-    "project_id": "id",
-    "storage_bucket": "bucket"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "app-id",
-        "android_client_info": { "package_name": "me.nanova.subspace" }
-      },
-      "api_key": [{"current_key": "key"}]
-    }
-  ]
-}
-EOF
-```
-
-2. Add a dummy keystore.properties to project root directory:
-
-```bash
-cat << EOF > keystore.properties
-storeFile:keystore.jks
-storePassword:fake-password
-keyAlias:fake-key-alias
-keyPassword:fake-password
-EOF
-```
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -33,14 +33,12 @@ android {
         }
     }
 
+    val isProdReleaseCI = System.getenv("PROD_RELEASE_CI")?.toBoolean() ?: false
+
     signingConfigs {
-        fun buildSignKey(
-            propertiesFile: String,
-            apkSigningConfig: ApkSigningConfig
-        ) {
-            val keystorePropertiesFile = rootProject.file(propertiesFile)
-            // skip for test
-            if (keystorePropertiesFile.exists()) {
+        fun buildSignConfig(apkSigningConfig: ApkSigningConfig) {
+            val keystorePropertiesFile = rootProject.file("keystore.properties")
+            if (isProdReleaseCI) {
                 val keystoreProperties = Properties()
                 keystoreProperties.load(FileInputStream(keystorePropertiesFile))
                 keystoreProperties.let {
@@ -52,10 +50,10 @@ android {
             }
         }
         create("githubReleaseKey") {
-            buildSignKey("keystore.properties", this)
+            buildSignConfig(this)
         }
         create("playUploadKey") {
-            buildSignKey("keystore.properties", this)
+            buildSignConfig(this)
         }
     }
 
@@ -91,7 +89,7 @@ android {
         onVariants { variant ->
             val googleTask =
                 tasks.findByName("process${variant.name.replaceFirstChar(Char::uppercase)}GoogleServices")
-            googleTask?.enabled = "debug" != variant.buildType
+            googleTask?.enabled = isProdReleaseCI && "debug" != variant.buildType
         }
     }
 
@@ -171,7 +169,7 @@ dependencies {
     implementation("com.squareup.okhttp3:logging-interceptor:4.12.0")
 
     // firebase
-    implementation(platform("com.google.firebase:firebase-bom:32.8.1"))
+    implementation(platform("com.google.firebase:firebase-bom:33.0.0"))
     implementation("com.google.firebase:firebase-crashlytics")
     implementation("com.google.firebase:firebase-analytics")