Merge branch 'master' into LarsRefsgaard/better-redirection-with-expi…

…red-tokens

.github/workflows/deploy_play_store.yml

@@ -53,18 +53,18 @@ jobs:
       - name: Setup Fastlane
         uses: ruby/setup-ruby@8a45918450651f5e4784b6031db26f4b9f76b251 # v1.150.0
         with:
-          ruby-version: "2.6"
+          ruby-version: "head"
           bundler-cache: true
           working-directory: android
 
       - name: Configure Keystore
         run: |
           echo "$PLAY_STORE_UPLOAD_KEY" | base64 --decode > app/upload-keystore.jks
           echo "$PLAY_STORE_CONFIG_JSON" > PLAY_STORE_CONFIG.json
-          echo "storeFile=upload-keystore.jks" >> key.properties
-          echo "keyAlias=$KEYSTORE_KEY_ALIAS" >> key.properties
-          echo "storePassword=$KEYSTORE_STORE_PASSWORD" >> key.properties
           echo "keyPassword=$KEYSTORE_KEY_PASSWORD" >> key.properties
+          echo "storePassword=$KEYSTORE_STORE_PASSWORD" >> key.properties
+          echo "keyAlias=$KEYSTORE_KEY_ALIAS" >> key.properties
+          echo "storeFile=upload-keystore.jks" >> key.properties
         env:
           PLAY_STORE_UPLOAD_KEY: ${{ secrets.PLAY_STORE_UPLOAD_KEY }}
           KEYSTORE_KEY_ALIAS: ${{ secrets.KEYSTORE_KEY_ALIAS }}
@@ -77,5 +77,5 @@ jobs:
       - name: Deploy to Play Store
         run: bundle exec fastlane ${{ inputs.lane || 'beta' }}
         env:
-          PLAY_STORE_CONFIG_JSON: ${{ secrets.PLAY_STORE_CONFIG_JSON }}
+          PLAY_STORE_JSON_KEY: ${{ secrets.PLAY_STORE_JSON_KEY }}
         working-directory: android

.github/workflows/deploy_play_store_beta.yml

@@ -1,16 +1,18 @@
 name: Deploy to Play Store beta
 on:
-  # Enable manual run
   push:
-    branches:
-      - 'master'
+    tags:
+      - '*'
+  workflow_dispatch:
+
 
 
 # Declare default permissions as read only.
 permissions: read-all
 
 jobs:
   workflow_run:
-    uses: cph-cachet/carp-studies-app/.github/workflows/deploy_play_store.yml@master
+    uses: cph-cachet/carp-studies-app/.github/workflows/deploy_play_store.yml@LarsRefsgaard/issue163
+    secrets: inherit
     with:
       lane: 'beta'

.github/workflows/deploy_play_store_prod.yml

@@ -1,9 +1,9 @@
 name: Deploy to Play Store production
 on:
-  # Enable manual run
-  push:
-    tags:
-      - '*'
+  release:
+    types:
+      - released
+  workflow_dispatch:
 
 
 # Declare default permissions as read only.
@@ -12,5 +12,6 @@ permissions: read-all
 jobs:
   workflow_run:
     uses: cph-cachet/carp-studies-app/.github/workflows/deploy_play_store.yml@master
+    secrets: inherit
     with:
       lane: 'promote_to_production'

.gitignore

@@ -116,3 +116,4 @@ app.*.map.json
 lib/blocs/credentials.dart
 carp/carpspec.yaml
 android/key.properties
+android/fastlane/report.xml

android/app/build.gradle

@@ -13,7 +13,7 @@ if (flutterRoot == null) {
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
-    flutterVersionCode = '18'
+    flutterVersionCode = '19'
 }
 
 def flutterVersionName = localProperties.getProperty('flutter.versionName')

android/fastlane/Appfile

@@ -1,2 +1,2 @@
 package_name("dk.cachet.carp_study_app") #
-json_key_file("PLAY_STORE_CONFIG.json")
+json_key_file("PLAY_STORE_CONFIG.json")