Removed user fraction

* Download each artifact separately

* typo

* Updated setup-java action

* Extract merged native libs directly in GP release job

.github/workflows/create_release.yml

@@ -23,6 +23,14 @@ on:
         description: "Release notes"
         required: true
         type: string
+      github-release-release:
+        type: boolean
+        description: Create Github release
+        default: true
+      google-play-release:
+        type: boolean
+        description: Create Google Play release
+        default: true
 
 env:
   BUILD_ARGS: --release --flavor prod --dart-define cameraPreviewAspectRatio=240/320 -t lib/main_prod.dart
@@ -30,14 +38,15 @@ env:
 jobs:
   build:
     name: Build .apk & .aab
+    if: ${{ inputs.github-release-release }} || ${{ inputs.google-play-release }}
     runs-on: macos-11
-    timeout-minutes: 15
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
 
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
           distribution: "zulu"
           java-version: "11"
@@ -120,6 +129,7 @@ jobs:
 
   update-version-in-repo:
     name: Update repo version
+    if: ${{ inputs.github-release-release }}
     needs: [build]
     runs-on: ubuntu-latest
     steps:
@@ -146,22 +156,25 @@ jobs:
 
   create-github-release:
     name: Create Github release
-    if: github.ref_name == 'main'
+    if: ${{ inputs.github-release-release }}
-    needs: [generate-release-notes, update-version-in-repo]
+    needs: [build, generate-release-notes, update-version-in-repo]
     runs-on: ubuntu-latest
     permissions:
       contents: write
     steps:
-      - name: Download apk & release notes
+      - name: Download apk
         uses: actions/download-artifact@v3
         with:
-          name: |
+          name: m3_lightmeter_apk
-            m3_lightmeter_apk
-            whatsnew-en-US
 
       - name: Rename apk
         run: mv app-prod-release.apk m3_lightmeter.apk
 
+      - name: Download release notes
+        uses: actions/download-artifact@v3
+        with:
+          name: whatsnew-en-US
+
       - uses: ncipollo/release-action@v1.12.0
         with:
           artifacts: "m3_lightmeter.apk"
@@ -174,9 +187,10 @@ jobs:
         with:
           name: m3_lightmeter_apk
 
-  extract-merged-native-libs:
+  create-google-play-release:
-    name: Extract merged native libraries
+    name: Create Google Play release
-    needs: [build]
+    if: ${{ inputs.google-play-release }}
+    needs: [build, generate-release-notes]
     runs-on: ubuntu-latest
     steps:
       - name: Download app bundle
@@ -189,27 +203,16 @@ jobs:
           unzip app-prod-release.aab
           (cd base/lib && zip -r "$OLDPWD/merged_native_libs.zip" .)
 
-      - name: Upload merged native libs to artifacts
+      - name: Download release notes
-        uses: actions/upload-artifact@v3
-        with:
-          name: merged_native_libs
-          path: merged_native_libs.zip
-
-  create-google-play-release:
-    name: Create Google Play release
-    if: github.ref_name == 'main'
-    needs: [generate-release-notes, extract-merged-native-libs]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download app bundle & merged native libs
         uses: actions/download-artifact@v3
         with:
-          name: |
+          name: whatsnew-en-US
-            m3_lightmeter_bundle
+
-            merged_native_libs
+      - name: Move release notes to a folder
-            whatsnew-en-US
+        run: |
+          mkdir whatsnew
+          mv whatsnew-en-US.md whatsnew
 
-      # TODO: create whatsnew folder and move release notes there
       - name: Create Google Play release
         id: create-google-play-release-step
         uses: r0adkll/upload-google-play@v1.1.1
@@ -219,10 +222,10 @@ jobs:
           releaseFiles: app-prod-release.aab
           track: production
           status: draft
-          userFraction: 1.0
           debugSymbols: merged_native_libs.zip
           whatsNewDirectory: whatsnew
 
+      # https://docs.github.com/en/actions/learn-github-actions/expressions#failure-with-conditions
       - name: Zip app bundle and merged_native_libs
         if: ${{ failure() && steps.create-google-play-release-step.conclusion == 'failure' }}
         run: zip m3_lightmeter_release.zip app-prod-release.aab merged_native_libs.zip
@@ -235,14 +238,14 @@ jobs:
           path: m3_lightmeter_release.zip
           
       - name: Delete app bundle & merged native libs artifacts
+        if: ${{ always() }}
         uses: geekyeggo/delete-artifact@v2
         with:
-          name: |
+          name: m3_lightmeter_bundle
-            m3_lightmeter_bundle
-            merged_native_libs
 
   cleanup:
     name: Cleanup
+    if: ${{ always() }}
     needs: [create-github-release, create-google-play-release]
     runs-on: ubuntu-latest
     steps:

pubspec.yaml

@@ -1,7 +1,7 @@
 name: lightmeter
 description: A new Flutter project.
 publish_to: "none"
-version: 0.13.0+36
+version: 0.13.1+37
 
 environment:
   sdk: ">=3.0.0 <4.0.0"