Merge branch 'master' into nutrition-plan-stats

# Conflicts:
#	lib/models/nutrition/nutritional_plan.g.dart
#	lib/widgets/measurements/charts.dart
#	lib/widgets/measurements/entries.dart
#	lib/widgets/weight/weight_overview.dart

Author: rolandgeider

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

@@ -9,7 +9,7 @@ runs:
       uses: subosito/flutter-action@v2
       with:
         channel: stable
-        flutter-version: 3.32.2
+        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,10 +11,15 @@ 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
 
@@ -34,13 +39,18 @@ jobs:
     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
 
+      # 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
@@ -57,7 +67,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Checkout application
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ inputs.ref }}
 

.github/workflows/build-linux.yml

@@ -25,7 +25,7 @@ jobs:
         #   runner: ubuntu-24.04-arm
     steps:
       - name: Checkout application
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ inputs.ref }}
 
@@ -56,14 +56,14 @@ jobs:
     steps:
 
       - name: Checkout flatpak-flathub repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: wger-project/de.wger.flutter
 
       - name: Bump version and update manifest
         run: |
-          pip install pyyaml toml
-          git clone https://github.com/TheAppgineer/flatpak-flutter.git --branch 0.7.0 ../flatpak-flutter
+          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
 

.github/workflows/build-windows.yml

@@ -15,7 +15,7 @@ jobs:
     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,7 +13,7 @@ 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 }}

.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

@@ -61,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/
 
@@ -105,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 }}
@@ -114,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/
   #
@@ -133,7 +133,7 @@ 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