Merge branch 'develop' into dependabot/gradle/mockk-1.14.4

Author: superus8r

.github/workflows/android.yml

@@ -34,9 +34,9 @@ jobs:
       - name: generate ksProp file
         run: ./gradlew generateKsPropFile
       - name: generate google-services.json file
-        run: ./gradlew generateGoogleServicesJson
         env:
           GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
+        run: ./gradlew generateGoogleServicesJson
       - name: setup fastlane
         run: bundle install
       - name: run unit tests