Merge branch 'master' into fix/timezone-problems

Author: rolandgeider

.github/actions/flutter-common/action.yml

@@ -9,7 +9,7 @@ runs:
       uses: subosito/flutter-action@v2
       with:
         channel: stable
-        flutter-version: 3.29.3
+        flutter-version: 3.32.8
         cache: true
 
     - name: Install Flutter dependencies

.github/pull_request_template.md

@@ -12,6 +12,6 @@ If applicable, please link to any related issues (`Closes #123`,
 
 - [ ] Tests for the changes have been added (for bug fixes / features)
 - [ ] Set a 100 character limit in your editor/IDE to avoid white space diffs in the PR
-  (run `dart format --line-length=100 .`)
+  (run `dart format .`)
 - [ ] Updated/added relevant documentation (doc comments with `///`).
 - [ ] Added relevant reviewers.

.github/workflows/build-android.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout application
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ inputs.ref }}
 
@@ -46,7 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout application
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ inputs.ref }}
 

.github/workflows/build-apple.yml

@@ -11,37 +11,76 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Checkout application
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ inputs.ref }}
 
+      # This seems to be related to https://github.com/actions/runner-images/issues/12758
+      - name: Xcode setup
+        run: |
+          sudo xcode-select --switch /Applications/Xcode_16.4.app
+
       - name: Common flutter setup
         uses: ./.github/actions/flutter-common
 
       - name: Build .app
-        run: flutter build ios --release --no-codesign
+        run: |
+          flutter build ios --release --no-codesign
+          cd build/ios/iphoneos
+          zip -r Runner.app.zip Runner.app
 
       - uses: actions/upload-artifact@v4
         with:
           name: builds-ios
           path: build/ios/iphoneos/Runner.app
 
+  build_ipa:
+    name: IPA
+    runs-on: macos-latest
+    steps:
+      - name: Checkout application
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ inputs.ref }}
+
+      - name: Common flutter setup
+        uses: ./.github/actions/flutter-common
+
+      # This seems to be related to https://github.com/actions/runner-images/issues/12758
+      - name: Xcode setup
+        run: |
+          sudo xcode-select --switch /Applications/Xcode_16.4.app
+
+      - name: Build .xcarchive
+        run: |
+          flutter build ipa --release --no-codesign
+          cd build/ios/archive
+          zip -r Runner.xcarchive.zip Runner.xcarchive
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: builds-ipa
+          path: build/ios/archive/Runner.xcarchive.zip
+
   build_macos:
     name: macOS
     runs-on: macos-latest
     steps:
       - name: Checkout application
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ inputs.ref }}
 
       - name: Common flutter setup
         uses: ./.github/actions/flutter-common
 
       - name: Build .app
-        run: flutter build macos --release
+        run: |
+          flutter build macos --release
+          cd build/macos/Build/Products/Release
+          zip -r wger.app.zip wger.app
 
       - uses: actions/upload-artifact@v4
         with:
           name: builds-macos
-          path: build/macos/Build/Products/Release/wger.app
+          path: build/macos/Build/Products/Release/wger.app.zip

.github/workflows/build-linux.yml

@@ -5,34 +5,76 @@ on:
       ref:
         required: true
         type: string
+    secrets:
+      SSH_DEPLOY_KEY:
+        required: true
 jobs:
+
+  # TODO: note that we currently only build for x64, as arm64 is not supported by
+  #       subosito/flutter-action@v2 yet and we don't want to install flutter manually
+  #       just for this workflow: https://github.com/subosito/flutter-action/issues/345
   build_linux:
-    name: Flathub
-    runs-on: ubuntu-latest
+    name: Build application - ${{ matrix.platform }}
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      matrix:
+        include:
+          - platform: x64
+            runner: ubuntu-latest
+        # - platform: arm64
+        #   runner: ubuntu-24.04-arm
     steps:
       - name: Checkout application
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ inputs.ref }}
 
       - name: Common setup
         uses: ./.github/actions/flutter-common
 
-      # Compare with list of available packages on the runner:
       # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
       - name: Build application for linux
         run: |
-          # ninja-build 
           sudo apt update
           sudo apt install -y pkg-config libgtk-3-dev liblzma-dev libstdc++-12-dev --no-install-recommends
           flutter build linux --release
-          cd flatpak/scripts
-          dart pub get
-          dart flatpak_packager.dart --meta ../flatpak_meta.json --addTodaysVersion ${{inputs.ref}}
-
+          tar -zcvf linux-${{ matrix.platform }}.tar.gz build/linux/${{ matrix.platform }}/release/bundle
       - uses: actions/upload-artifact@v4
         with:
           name: builds-linux
           path: |
-            flatpak/scripts/flatpak_generator_exports/wger-linux-x86_64.tar.gz
-            flatpak/scripts/flatpak_generator_exports/wger-linux-x86_64.sha256
+            linux-${{ matrix.platform }}.tar.gz
+
+  generate_flathub_manifest:
+    runs-on: ubuntu-latest
+    name: Update flathub manifest
+
+    # If the job fails just continue, this can be done manually later
+    continue-on-error: true
+    needs:
+      - build_linux
+    steps:
+
+      - name: Checkout flatpak-flathub repo
+        uses: actions/checkout@v5
+        with:
+          repository: wger-project/de.wger.flutter
+
+      - name: Bump version and update manifest
+        run: |
+          pip install pyyaml toml packaging
+          git clone https://github.com/TheAppgineer/flatpak-flutter.git --branch 0.7.2 ../flatpak-flutter
+          python bump-wger-version.py ${{ inputs.ref }}
+          ../flatpak-flutter/flatpak-flutter.py --app-module wger flatpak-flutter.json
+
+      - name: Push updated config to flathub repository
+        uses: cpina/github-action-push-to-another-repository@main
+        env:
+          SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
+        with:
+          destination-github-username: wger-project
+          destination-repository-name: de.wger.flutter
+          user-email: [email protected]
+          target-branch: release-${{ inputs.ref }}
+          create-target-branch-if-needed: true
+          commit-message: Update to ${{ inputs.ref }}

.github/workflows/build-windows.yml

@@ -6,12 +6,16 @@ on:
         required: true
         type: string
 jobs:
+  # TODO: note that we currently only upload the .exe file, which is not
+  #       sufficient for a proper Windows release. See the documentation
+  #       for what would be necessary (low priority, but nice to have):
+  #       https://docs.flutter.dev/platform-integration/windows/building
   build_windows:
     name: Windows
     runs-on: windows-latest
     steps:
       - name: Checkout application
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ inputs.ref }}
 

.github/workflows/bump-version.yml

@@ -13,14 +13,17 @@ jobs:
     steps:
 
       - name: Checkout application
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0 # needed to push changes
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Common flutter setup
         uses: ./.github/actions/flutter-common
 
+      - name: Setup uv
+        uses: astral-sh/setup-uv@v6
+
       - name: Validate version
         run: |
           RELEASE_VERSION="${{ inputs.app_version }}"
@@ -39,11 +42,16 @@ jobs:
           NEXT_BUILD=$(( (CURRENT_BUILD / 10 + 1) * 10 ))
           flutter pub run cider version ${{ inputs.app_version }}+${NEXT_BUILD}
 
+      - name: Bump flatpak version
+        run: |
+          cd flatpak
+          uv run bump-flatpak-version.py ${{ inputs.app_version }}
+
       - name: Tag release and commit pubspec
         run: |
           git config user.name Github-Actions
           git config user.email [email protected]
-          git add pubspec.yaml
-          git commit -m "Bump version to $( flutter pub run cider version )"
+          git add pubspec.yaml flatpak/de.wger.flutter.metainfo.xml
+          git commit -m "Bump version to ${{ inputs.app_version }}"
           git tag ${{ inputs.app_version }}
           git push origin HEAD:master --tags

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
     name: Run tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Common flutter setup
         uses: ./.github/actions/flutter-common

.github/workflows/linter.yml.bak

@@ -26,7 +26,7 @@ jobs:
         run: flutter pub get
 
       - name: Check for formatting issues (run "dart format . ")
-        run: dart format --line-length=100 .
+        run: dart format .
 
       - name: Push a commit with the changed files
         continue-on-error: true

.github/workflows/make-release.yml

@@ -26,6 +26,8 @@ jobs:
     uses: ./.github/workflows/build-linux.yml
     with:
       ref: ${{ github.event.inputs.version }}
+    secrets:
+      SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
 
   build_android:
     name: Android
@@ -59,12 +61,12 @@ jobs:
       - build_linux
     steps:
       - name: Checkout application
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.event.inputs.version }}
 
       - name: Download builds
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           path: /tmp/
 
@@ -103,7 +105,7 @@ jobs:
   #      - build_apple
   #    steps:
   #      - name: Checkout application
-  #        uses: actions/checkout@v4
+  #        uses: actions/checkout@v5
   #        with:
   #          ref: feature/build-process
   #        #          ref: ${{ github.event.inputs.version }}
@@ -112,7 +114,7 @@ jobs:
   #        uses: ./.github/actions/flutter-common
   #
   #      - name: Download builds
-  #        uses: actions/download-artifact@v4
+  #        uses: actions/download-artifact@v5
   #        with:
   #          path: /tmp/
   #
@@ -131,54 +133,20 @@ jobs:
 
     steps:
       - name: Download builds
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
 
       - name: Make Github release
         uses: softprops/action-gh-release@v2
         with:
+          generate_release_notes: true
           tag_name: ${{ inputs.version }}
           files: |
             builds-aab/app-release.aab
             builds-apk/app-release.apk
-            builds-linux/wger-linux-x86_64.tar.gz
-            builds-linux/wger-linux-x86_64.sha256
-            builds-ios/Runner.app
-            builds-macos/wger.app
+            builds-linux/linux-x64.tar.gz
+            builds-ios/Runner.app.zip
+            builds-ipa/Runner.xcarchive.zip
+            builds-macos/wger.app.zip
             builds-windows/wger.exe
 
-  generate_flathub_manifest:
-    runs-on: ubuntu-latest
-    name: Upload flathub manifest
-    needs:
-      - make_gh_release
-    steps:
-      - name: Checkout application
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.inputs.version }}
-
-      - name: Common flutter setup
-        uses: ./.github/actions/flutter-common
-
-      - name: Generate manifest
-        run: |
-          cd flatpak/scripts
-          dart pub get
-          dart manifest_generator.dart --meta ../flatpak_meta.json --github
-          mkdir ../../flathub
-          cp flatpak_generator_exports/de.wger.flutter.json ../../flathub
-          cp flatpak_generator_exports/flathub.json ../../flathub
-
-      - name: Push updated config to flathub repository
-        uses: cpina/github-action-push-to-another-repository@main
-        env:
-          SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
-        with:
-          source-directory: flathub
-          destination-github-username: wger-project
-          destination-repository-name: de.wger.flutter
-          user-email: [email protected]
-          target-branch: release-${{ github.event.inputs.version }}
-          create-target-branch-if-needed: true
-          commit-message: Update to ${{ github.event.inputs.version }}