Merge remote-tracking branch 'origin/master' into feature/weblate

Author: rolandgeider

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

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

.github/workflows/analyze.yml

@@ -35,9 +35,6 @@ jobs:
       - name: Common flutter setup
         uses: ./.github/actions/flutter-common
 
-      - name: Install dependencies
-        run: flutter pub get
-
       - name: Analyze
         run: flutter analyze
 

.github/workflows/ci.yml

@@ -17,10 +17,18 @@ on:
 permissions:
   contents: read
 
+concurrency:
+  group: ci-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
-    name: Run tests
+    name: Run tests (shard ${{ matrix.shard }})
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        shard: [0, 1, 2, 3]
     env:
       TZ: Europe/Berlin
     steps:
@@ -29,19 +37,31 @@ jobs:
       - name: Common flutter setup
         uses: ./.github/actions/flutter-common
 
-      - name: Install dependencies
-        run: |
-          sudo apt install libsqlite3-dev lcov --no-install-recommends
-          flutter pub get
+      - name: Install system dependencies
+        run: sudo apt install libsqlite3-dev lcov --no-install-recommends
 
       # Removing some folders from the coverage since these files are not really
       # part of the app code and just get in the way of the report
       - name: Test app
         run: |
-          flutter test --coverage
+          flutter test --coverage --total-shards 4 --shard-index ${{ matrix.shard }}
           lcov --remove coverage/lcov.info 'lib/l10n/generated/*' 'lib/theme/*' -o coverage/lcov.info
 
-      - name: Coveralls
+      - name: Upload coverage to Coveralls
+        uses: coverallsapp/github-action@v2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          flag-name: shard-${{ matrix.shard }}
+          parallel: true
+
+  finish:
+    name: Finish coverage
+    needs: test
+    runs-on: ubuntu-latest
+    if: ${{ always() }}
+    steps:
+      - name: Close parallel Coveralls build
         uses: coverallsapp/github-action@v2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel-finished: true

ios/Runner.xcodeproj/project.pbxproj

@@ -77,7 +77,6 @@
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
-				BB0286322FD60C00014F981C /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
@@ -105,13 +104,6 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
-		BB0286322FD60C00014F981C /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Pods;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */

lib/providers/app_link_router.dart lib/core/app_link_router.dartlib/providers/app_link_router.dart renamed to lib/core/app_link_router.dart

@@ -24,9 +24,9 @@ import 'package:app_links/app_links.dart';
 import 'package:clock/clock.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:logging/logging.dart';
-import 'package:wger/helpers/consts.dart';
-import 'package:wger/helpers/shared_preferences.dart';
-import 'package:wger/providers/auth_notifier.dart';
+import 'package:wger/core/consts.dart';
+import 'package:wger/core/network/auth_notifier.dart';
+import 'package:wger/core/shared_preferences.dart';
 
 /// Custom URL scheme + host the wger web-handoff view redirects to.
 /// Must match the registration in iOS Info.plist, AndroidManifest.xml, etc.

lib/providers/app_settings_notifier.dart lib/core/app_settings_notifier.dartlib/providers/app_settings_notifier.dart renamed to lib/core/app_settings_notifier.dart

@@ -24,9 +24,9 @@ import 'package:flutter_riverpod/flutter_riverpod.dart' show Provider;
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:wger/helpers/consts.dart';
-import 'package:wger/helpers/locale.dart';
-import 'package:wger/helpers/shared_preferences.dart';
+import 'package:wger/core/consts.dart';
+import 'package:wger/core/locale.dart';
+import 'package:wger/core/shared_preferences.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 
 part 'app_settings_notifier.freezed.dart';