Skip to content

Commit 6c07ab9

Browse files
Update for Flutter 3.32 (#2288)
## Pre-launch Checklist - [x] I read the [Effective Dart: Style] _recently_, and have followed its advice. - [x] I signed the [CLA]. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-devrel channel on [Discord]. <!-- Links --> [Effective Dart: Style]: https://dart.dev/guides/language/effective-dart/style [CLA]: https://cla.developers.google.com/ [Discord]: https://github.com/flutter/flutter/blob/master/docs/contributing/Chat.md
1 parent c2bd4fd commit 6c07ab9

File tree

1,540 files changed

+31790
-38706
lines changed

Some content is hidden

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

1,540 files changed

+31790
-38706
lines changed

.github/workflows/flutter-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
3030
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
3131
with:
32-
distribution: 'zulu' # See https://github.com/actions/setup-java#supported-distributions
32+
distribution: "zulu" # See https://github.com/actions/setup-java#supported-distributions
3333
java-version: "17"
3434
- uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046
3535
with:

adaptive_app/codelab_rebuild.yaml

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -317,11 +317,10 @@ steps:
317317
318318
runApp(
319319
ChangeNotifierProvider<FlutterDevPlaylists>(
320-
create:
321-
(context) => FlutterDevPlaylists(
322-
flutterDevAccountId: flutterDevAccountId,
323-
youTubeApiKey: youTubeApiKey,
324-
),
320+
create: (context) => FlutterDevPlaylists(
321+
flutterDevAccountId: flutterDevAccountId,
322+
youTubeApiKey: youTubeApiKey,
323+
),
325324
child: const PlaylistsApp(),
326325
),
327326
);
@@ -574,13 +573,12 @@ steps:
574573
uri: Uri.parse(
575574
'https://www.youtube.com/watch?v=${playlistItem.snippet!.resourceId!.videoId}',
576575
),
577-
builder:
578-
(context, followLink) => IconButton(
579-
onPressed: followLink,
580-
color: Colors.red,
581-
icon: const Icon(Icons.play_circle_fill),
582-
iconSize: 45,
583-
),
576+
builder: (context, followLink) => IconButton(
577+
onPressed: followLink,
578+
color: Colors.red,
579+
icon: const Icon(Icons.play_circle_fill),
580+
iconSize: 45,
581+
),
584582
),
585583
],
586584
);
@@ -1211,10 +1209,9 @@ steps:
12111209
class AdaptiveImage extends StatelessWidget {
12121210
AdaptiveImage.network(String url, {super.key}) {
12131211
if (kIsWeb) {
1214-
_url =
1215-
Uri.parse(
1216-
url,
1217-
).replace(host: 'localhost', port: 8080, scheme: 'http').toString();
1212+
_url = Uri.parse(
1213+
url,
1214+
).replace(host: 'localhost', port: 8080, scheme: 'http').toString();
12181215
} else {
12191216
_url = url;
12201217
}
@@ -1430,8 +1427,8 @@ steps:
14301427
body: Center(
14311428
child: Link(
14321429
uri: authUrl,
1433-
builder:
1434-
(context, followLink) => widget.button(onPressed: followLink),
1430+
builder: (context, followLink) =>
1431+
widget.button(onPressed: followLink),
14351432
),
14361433
),
14371434
);
@@ -1526,7 +1523,7 @@ steps:
15261523
GoRoute(
15271524
path: 'playlist/:id',
15281525
builder: (context, state) {
1529-
@@ -44,18 +64,9 @@ final _router = GoRouter(
1526+
@@ -44,17 +64,9 @@ final _router = GoRouter(
15301527
);
15311528
15321529
void main() {
@@ -1537,17 +1534,16 @@ steps:
15371534
-
15381535
runApp(
15391536
- ChangeNotifierProvider<FlutterDevPlaylists>(
1540-
- create:
1541-
- (context) => FlutterDevPlaylists(
1542-
- flutterDevAccountId: flutterDevAccountId,
1543-
- youTubeApiKey: youTubeApiKey,
1544-
- ),
1537+
- create: (context) => FlutterDevPlaylists(
1538+
- flutterDevAccountId: flutterDevAccountId,
1539+
- youTubeApiKey: youTubeApiKey,
1540+
- ),
15451541
+ ChangeNotifierProvider<AuthedUserPlaylists>(
15461542
+ create: (context) => AuthedUserPlaylists(),
15471543
child: const PlaylistsApp(),
15481544
),
15491545
);
1550-
@@ -67,7 +78,7 @@ class PlaylistsApp extends StatelessWidget {
1546+
@@ -66,7 +78,7 @@ class PlaylistsApp extends StatelessWidget {
15511547
@override
15521548
Widget build(BuildContext context) {
15531549
return MaterialApp.router(

adaptive_app/step_03/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip

adaptive_app/step_03/android/settings.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ pluginManagement {
1818

1919
plugins {
2020
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
21-
id("com.android.application") version "8.7.0" apply false
22-
id("org.jetbrains.kotlin.android") version "1.8.22" apply false
21+
id("com.android.application") version "8.7.3" apply false
22+
id("org.jetbrains.kotlin.android") version "2.1.0" apply false
2323
}
2424

2525
include(":app")

adaptive_app/step_03/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<MacroExpansion>
3132
<BuildableReference
@@ -54,6 +55,7 @@
5455
buildConfiguration = "Debug"
5556
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5657
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
58+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
5759
launchStyle = "0"
5860
useCustomWorkingDirectory = "NO"
5961
ignoresPersistentStateOnLaunch = "NO"

adaptive_app/step_03/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
1919
version: 1.0.0+1
2020

2121
environment:
22-
sdk: ^3.7.0-0
22+
sdk: ^3.8.0
2323

2424
# Dependencies specify other packages that your package needs in order to work.
2525
# To automatically upgrade your package dependencies to the latest versions

adaptive_app/step_04/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip

adaptive_app/step_04/android/settings.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ pluginManagement {
1818

1919
plugins {
2020
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
21-
id("com.android.application") version "8.7.0" apply false
22-
id("org.jetbrains.kotlin.android") version "1.8.22" apply false
21+
id("com.android.application") version "8.7.3" apply false
22+
id("org.jetbrains.kotlin.android") version "2.1.0" apply false
2323
}
2424

2525
include(":app")

0 commit comments

Comments
 (0)