Skip to content

Commit d071d14

Browse files
committed
Update flutter to 3.29
The translations are not stored in a synthetic package anymore, but the files are just copied to a specific folder so it can be more easily imported Also, flutter_barcode_scanner was replaced by simple_barcode_scanner since the first hasn't been updated in 3 years and was already causing problems for some time
1 parent b8f4167 commit d071d14

File tree

135 files changed

+1249
-577
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+1249
-577
lines changed

.github/workflows/build-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
uses: subosito/flutter-action@v2
2727
with:
2828
channel: stable
29-
flutter-version: 3.27.x
29+
flutter-version: 3.29.x
3030

3131
- name: Flutter info
3232
run: |

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
with:
2121
cache: true
2222
channel: 'stable'
23-
flutter-version: '3.27.x'
23+
flutter-version: '3.29.x'
2424

2525
- run: dart --version
2626
- run: flutter --version

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ if (keystorePropertiesFile.exists()) {
2323

2424
android {
2525
namespace = "de.wger.flutter"
26-
compileSdkVersion 34
27-
ndkVersion "25.1.8937393"
26+
compileSdkVersion 35
27+
ndkVersion "26.3.11579264"
2828

2929
compileOptions {
3030
sourceCompatibility JavaVersion.VERSION_11

integration_test/1_dashboard.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:flutter/material.dart';
2-
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
32
import 'package:mockito/mockito.dart';
43
import 'package:provider/provider.dart';
4+
import 'package:wger/l10n/generated/app_localizations.dart';
55
import 'package:wger/models/workouts/session.dart';
66
import 'package:wger/providers/body_weight.dart';
77
import 'package:wger/providers/measurement.dart';

integration_test/2_workout.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:flutter/material.dart';
2-
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
32
import 'package:mockito/mockito.dart';
43
import 'package:provider/provider.dart';
4+
import 'package:wger/l10n/generated/app_localizations.dart';
55
import 'package:wger/providers/routines.dart';
66
import 'package:wger/screens/routine_screen.dart';
77
import 'package:wger/theme/theme.dart';

integration_test/3_gym_mode.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import 'package:flutter/material.dart';
2-
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
32
import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod;
43
import 'package:mockito/mockito.dart';
54
import 'package:provider/provider.dart';
5+
import 'package:wger/l10n/generated/app_localizations.dart';
66
import 'package:wger/providers/exercises.dart';
77
import 'package:wger/providers/routines.dart';
88
import 'package:wger/screens/gym_mode.dart';

integration_test/4_measurements.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:flutter/material.dart';
2-
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
32
import 'package:mockito/mockito.dart';
43
import 'package:provider/provider.dart';
4+
import 'package:wger/l10n/generated/app_localizations.dart';
55
import 'package:wger/providers/measurement.dart';
66
import 'package:wger/screens/measurement_categories_screen.dart';
77
import 'package:wger/theme/theme.dart';

integration_test/5_nutritional_plan.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import 'package:drift/native.dart';
22
import 'package:flutter/material.dart';
3-
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
43
import 'package:provider/provider.dart';
54
import 'package:wger/database/ingredients/ingredients_database.dart';
5+
import 'package:wger/l10n/generated/app_localizations.dart';
66
import 'package:wger/providers/body_weight.dart';
77
import 'package:wger/providers/nutrition.dart';
88
import 'package:wger/screens/nutritional_plan_screen.dart';

integration_test/6_weight.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:flutter/material.dart';
2-
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
32
import 'package:mockito/mockito.dart';
43
import 'package:provider/provider.dart';
4+
import 'package:wger/l10n/generated/app_localizations.dart';
55
import 'package:wger/providers/body_weight.dart';
66
import 'package:wger/providers/nutrition.dart';
77
import 'package:wger/providers/user.dart';

l10n.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
synthetic-package: false # see https://docs.flutter.dev/release/breaking-changes/flutter-generate-i10n-source
2+
13
arb-dir: lib/l10n
4+
output-dir: lib/l10n/generated
25
template-arb-file: app_en.arb
36
output-localization-file: app_localizations.dart
47
nullable-getter: false

0 commit comments

Comments
 (0)