Fix signing for firebase (#146)

* fix signing * change build type to develop
novasamatech · Jan 31, 2022 · be4f509 · be4f509
1 parent e732b7c
commit be4f509
Show file tree

Hide file tree

Showing 7 changed files with 93 additions and 45 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -1,6 +1,7 @@
 name: Pull request
 
-on: [pull_request]
+on:
+  [pull_request]
 
 jobs:
   build:

diff --git a/.github/workflows/push_develop.yml b/.github/workflows/push_develop.yml
@@ -37,12 +37,12 @@ jobs:
         run: ./gradlew runTest
 
       - name: Build with Gradle
-        run: ./gradlew assembleDebug
+        run: ./gradlew assembleDevelop
 
       - uses: actions/upload-artifact@v2
         with:
           name: apk
-          path: app/build/outputs/apk/debug/
+          path: app/build/outputs/apk/develop/
 
   upload:
     runs-on: ubuntu-latest
@@ -61,11 +61,11 @@ jobs:
         continue-on-error: true
         uses: wzieba/Firebase-Distribution-Github-Action@v1
         with:
-          appId: ${{ secrets.ANDROID_DEV_FIREBASE_APP_ID }}
+          appId: ${{ secrets.ANDROID_DEVELOP_FIREBASE_APP_ID }}
           token: ${{ secrets.ANDROID_DEV_FIREBASE_TOKEN }}
           releaseNotes: ${{ github.event.head_commit.message }}
           groups: dev-team
-          file: app/app-debug.apk
+          file: app/app-develop.apk
 
       - name: Sleep for 60 seconds
         uses: whatnick/wait-action@master
@@ -77,8 +77,8 @@ jobs:
         if: steps.upload.outcome=='failure'
         uses: wzieba/Firebase-Distribution-Github-Action@v1
         with:
-          appId: ${{ secrets.ANDROID_DEV_FIREBASE_APP_ID }}
+          appId: ${{ secrets.ANDROID_DEVELOP_FIREBASE_APP_ID }}
           token: ${{ secrets.ANDROID_DEV_FIREBASE_TOKEN }}
           releaseNotes: ${{ github.event.head_commit.message }}
           groups: dev-team
-          file: app/app-debug.apk
+          file: app/app-develop.apk
diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,5 @@ app/*.apk
 # ignore jacoco coverage reports
 /coverage
 
-*.jks
+*.jks
+!develop_key.jks
diff --git a/app/build.gradle b/app/build.gradle
@@ -20,7 +20,7 @@ android {
     }
     signingConfigs {
       ci {
-          storeFile file("fearless_ci.jks")
+          storeFile file("develop_key.jks")
           storePassword System.env.CI_KEYSTORE_PASS ?: ""
           keyAlias System.env.CI_KEYSTORE_KEY_ALIAS ?: ""
           keyPassword System.env.CI_KEYSTORE_KEY_PASS ?: ""

diff --git a/app/fearless_ci.jks → app/develop_key.jks b/app/fearless_ci.jks → app/develop_key.jks
diff --git a/app/src/debug/google-services.json b/app/src/debug/google-services.json
@@ -40,42 +40,6 @@
           ]
         }
       }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:171267697857:android:3f2a01bd323948c5267840",
-        "android_client_info": {
-          "package_name": "io.novasolution.nova.debug"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "171267697857-m8ualu05e8trer0rpc5or4i6i8qjsrsl.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyBVjHJ5scX6GEKAhjKtLDvfPEGZcoLXty8"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "171267697857-m8ualu05e8trer0rpc5or4i6i8qjsrsl.apps.googleusercontent.com",
-              "client_type": 3
-            },
-            {
-              "client_id": "171267697857-r9i2v9goejmkti198fnasft5anm7vdfk.apps.googleusercontent.com",
-              "client_type": 2,
-              "ios_info": {
-                "bundle_id": "io.novawallet.nova"
-              }
-            }
-          ]
-        }
-      }
     }
   ],
   "configuration_version": "1"

diff --git a/app/src/develop/google-services.json b/app/src/develop/google-services.json
@@ -0,0 +1,82 @@
+{
+  "project_info": {
+    "project_number": "171267697857",
+    "project_id": "nova-wallet-dev",
+    "storage_bucket": "nova-wallet-dev.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:171267697857:android:d987123a4a81a1e5267840",
+        "android_client_info": {
+          "package_name": "io.novafoundation.nova.debug"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "171267697857-m8ualu05e8trer0rpc5or4i6i8qjsrsl.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBVjHJ5scX6GEKAhjKtLDvfPEGZcoLXty8"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "171267697857-m8ualu05e8trer0rpc5or4i6i8qjsrsl.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "171267697857-1oermg1hb058890b55ie40ch4vl4rv6b.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "io.nova.novawallet.dev"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:171267697857:android:a456988f1af9a191267840",
+        "android_client_info": {
+          "package_name": "io.novafoundation.nova.dev"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "171267697857-m8ualu05e8trer0rpc5or4i6i8qjsrsl.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBVjHJ5scX6GEKAhjKtLDvfPEGZcoLXty8"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "171267697857-m8ualu05e8trer0rpc5or4i6i8qjsrsl.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "171267697857-1oermg1hb058890b55ie40ch4vl4rv6b.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "io.nova.novawallet.dev"
+              }
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}