Skip to content

Commit 7da167f

Browse files
jhbruhnclaude
andcommitted
chore(deps): follow Flutter to 3.47.1
The pin moves in lockstep across CI, the release workflow, the Dockerfile build stage and apps/federfall's `flutter:` constraint. 3.47 raises two platform floors that were below its minimum, so both move with it: - Android: Java/Kotlin 11 → 17 (Gradle 9.0 and AGP 8.12.3 already cover it). - iOS: deployment target 13.0 → 15.0, in the pbxproj and in AppFrameworkInfo.plist. The UIScene manifest Xcode 27 wants is already there. None of 3.47's three documented breaking changes touch this code: no `describeEnum`, no Semantics `header`/`headingLevel`, no render-to-texture. What the newer analyzer does flag is four sites, and `dart fix` mangles two of them into a dangling `;` — so `unawaited` came off by hand where the call spans lines, and the conditional expression in the aviary subtitle list became a nested if-element. The two `dart:async` imports it left unused are gone. `flutter pub get` on 3.47 writes platform-directory exclusions into both analysis_options.yaml files itself; they are kept as generated. Verified on 3.47.1 / Dart 3.13.1: analyze clean from the root, format clean, 1115 app tests, 216 federfall_data, 132 federfall_models — all green. Co-Authored-By: Claude Opus 5 <[email protected]>
1 parent d5e4569 commit 7da167f

14 files changed

Lines changed: 65 additions & 56 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ concurrency:
1212
cancel-in-progress: true
1313

1414
env:
15-
FLUTTER_VERSION: "3.44.3"
15+
FLUTTER_VERSION: "3.47.1"
1616

1717
jobs:
1818
build:

‎.github/workflows/release-please.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ permissions:
1515
pull-requests: write
1616

1717
env:
18-
FLUTTER_VERSION: "3.44.3"
18+
FLUTTER_VERSION: "3.47.1"
1919

2020
jobs:
2121
release-please:

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ ARG ZUGVOGEL_PB_BASE=ghcr.io/jhbruhn/zugvogel-pb-base:sha-98c011a36e43606db42b77
3333
# no third-party prebuilt image). The fat build stage is discarded.
3434
FROM debian:bookworm-slim AS flutterbuild
3535

36-
# Keep in sync with the repo's pinned Flutter (apps/federfall: flutter ^3.44.0).
37-
ARG FLUTTER_VERSION=3.44.3
36+
# Keep in sync with the repo's pinned Flutter (apps/federfall: flutter ^3.47.0).
37+
ARG FLUTTER_VERSION=3.47.1
3838

3939
ENV DEBIAN_FRONTEND=noninteractive \
4040
PUB_CACHE=/pub-cache \

‎analysis_options.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,14 @@
44
# to be declared at the pub-workspace root, so riverpod_lint is enabled here
55
# and applies to every workspace member. Per-package lint rules live in each
66
# package's own analysis_options.yaml (e.g. apps/federfall/analysis_options.yaml).
7+
analyzer:
8+
exclude:
9+
- build/**
10+
- android/**
11+
- ios/**
12+
- web/**
13+
- windows/**
14+
- macos/**
15+
- linux/**
716
plugins:
817
riverpod_lint: ^3.1.4

‎apps/federfall/analysis_options.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ analyzer:
99
- lib/l10n/gen/*
1010
- "**/*.g.dart"
1111
- "**/*.freezed.dart"
12+
- build/**
13+
- android/**
14+
- ios/**
15+
- web/**
16+
- windows/**
17+
- macos/**
18+
- linux/**
1219
linter:
1320
rules:
1421
public_member_api_docs: false

‎apps/federfall/android/app/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ android {
2121
ndkVersion = flutter.ndkVersion
2222

2323
compileOptions {
24-
sourceCompatibility = JavaVersion.VERSION_11
25-
targetCompatibility = JavaVersion.VERSION_11
24+
sourceCompatibility = JavaVersion.VERSION_17
25+
targetCompatibility = JavaVersion.VERSION_17
2626
// flutter_local_notifications needs java.time on pre-26 API levels.
2727
isCoreLibraryDesugaringEnabled = true
2828
}
@@ -91,7 +91,7 @@ android {
9191

9292
kotlin {
9393
compilerOptions {
94-
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11
94+
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
9595
}
9696
}
9797

‎apps/federfall/ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>13.0</string>
24+
<string>15.0</string>
2525
</dict>
2626
</plist>

‎apps/federfall/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@
375375
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
376376
GCC_WARN_UNUSED_FUNCTION = YES;
377377
GCC_WARN_UNUSED_VARIABLE = YES;
378-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
378+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
379379
MTL_ENABLE_DEBUG_INFO = YES;
380380
ONLY_ACTIVE_ARCH = YES;
381381
SDKROOT = iphoneos;
@@ -466,7 +466,7 @@
466466
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
467467
GCC_WARN_UNUSED_FUNCTION = YES;
468468
GCC_WARN_UNUSED_VARIABLE = YES;
469-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
469+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
470470
MTL_ENABLE_DEBUG_INFO = NO;
471471
SDKROOT = iphoneos;
472472
SUPPORTED_PLATFORMS = iphoneos;
@@ -557,7 +557,7 @@
557557
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
558558
GCC_WARN_UNUSED_FUNCTION = YES;
559559
GCC_WARN_UNUSED_VARIABLE = YES;
560-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
560+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
561561
MTL_ENABLE_DEBUG_INFO = NO;
562562
SDKROOT = iphoneos;
563563
SUPPORTED_PLATFORMS = iphoneos;
@@ -652,7 +652,7 @@
652652
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
653653
GCC_WARN_UNUSED_FUNCTION = YES;
654654
GCC_WARN_UNUSED_VARIABLE = YES;
655-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
655+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
656656
MTL_ENABLE_DEBUG_INFO = YES;
657657
ONLY_ACTIVE_ARCH = YES;
658658
SDKROOT = iphoneos;
@@ -743,7 +743,7 @@
743743
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
744744
GCC_WARN_UNUSED_FUNCTION = YES;
745745
GCC_WARN_UNUSED_VARIABLE = YES;
746-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
746+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
747747
MTL_ENABLE_DEBUG_INFO = NO;
748748
SDKROOT = iphoneos;
749749
SUPPORTED_PLATFORMS = iphoneos;
@@ -832,7 +832,7 @@
832832
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
833833
GCC_WARN_UNUSED_FUNCTION = YES;
834834
GCC_WARN_UNUSED_VARIABLE = YES;
835-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
835+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
836836
MTL_ENABLE_DEBUG_INFO = NO;
837837
SDKROOT = iphoneos;
838838
SUPPORTED_PLATFORMS = iphoneos;
@@ -929,7 +929,7 @@
929929
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
930930
GCC_WARN_UNUSED_FUNCTION = YES;
931931
GCC_WARN_UNUSED_VARIABLE = YES;
932-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
932+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
933933
MTL_ENABLE_DEBUG_INFO = YES;
934934
ONLY_ACTIVE_ARCH = YES;
935935
SDKROOT = iphoneos;
@@ -1020,7 +1020,7 @@
10201020
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
10211021
GCC_WARN_UNUSED_FUNCTION = YES;
10221022
GCC_WARN_UNUSED_VARIABLE = YES;
1023-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
1023+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
10241024
MTL_ENABLE_DEBUG_INFO = NO;
10251025
SDKROOT = iphoneos;
10261026
SUPPORTED_PLATFORMS = iphoneos;
@@ -1111,7 +1111,7 @@
11111111
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
11121112
GCC_WARN_UNUSED_FUNCTION = YES;
11131113
GCC_WARN_UNUSED_VARIABLE = YES;
1114-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
1114+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
11151115
MTL_ENABLE_DEBUG_INFO = NO;
11161116
SDKROOT = iphoneos;
11171117
SUPPORTED_PLATFORMS = iphoneos;

‎apps/federfall/lib/features/aviaries/aviaries_screen.dart‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,10 @@ class _AviaryTile extends ConsumerWidget {
107107
if (keeper != null) memberLabel(keeper),
108108
?aviary.location,
109109
if (capacity != null)
110-
residents == null
111-
? l10n.aviaryCapacityValue(capacity)
112-
: l10n.aviaryOccupancyOfCapacity(residents, capacity)
110+
if (residents == null)
111+
l10n.aviaryCapacityValue(capacity)
112+
else
113+
l10n.aviaryOccupancyOfCapacity(residents, capacity)
113114
else if (residents != null && residents > 0)
114115
l10n.aviaryOccupancy(residents),
115116
if (!aviary.active) l10n.aviaryInactive,

‎apps/federfall/lib/features/cases/medications/dose_calculator_panel.dart‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import 'dart:async';
2-
31
import 'package:federfall/features/cases/medications/medications_providers.dart';
42
import 'package:federfall/features/cases/weights/weights_providers.dart';
53
import 'package:federfall/l10n/l10n.dart';
@@ -136,13 +134,11 @@ class _DoseCalculatorPanelState extends ConsumerState<DoseCalculatorPanel> {
136134
// Scrolls the least amount that puts the panel's bottom on screen, and
137135
// is a no-op both when it already fits and when there is no scrollable
138136
// ancestor at all.
139-
unawaited(
140-
Scrollable.ensureVisible(
141-
ctx,
142-
alignmentPolicy: ScrollPositionAlignmentPolicy.keepVisibleAtEnd,
143-
duration: const Duration(milliseconds: 200),
144-
curve: Curves.easeOut,
145-
),
137+
Scrollable.ensureVisible(
138+
ctx,
139+
alignmentPolicy: ScrollPositionAlignmentPolicy.keepVisibleAtEnd,
140+
duration: const Duration(milliseconds: 200),
141+
curve: Curves.easeOut,
146142
);
147143
});
148144
}

0 commit comments

Comments
 (0)