Skip to content

Commit 7922425

Browse files
jesswrdjesswrd
committed
Merge branch 'main' into kgp-bulk-update
2 parents 681c7e7 + 952418d commit 7922425

File tree

693 files changed

+11362
-13660
lines changed

Some content is hidden

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

693 files changed

+11362
-13660
lines changed

‎.ci.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ platform_properties:
2929
dependencies: >-
3030
[
3131
{"dependency": "android_sdk", "version": "version:36v3"},
32-
{"dependency": "open_jdk", "version": "version:17"},
32+
{"dependency": "open_jdk", "version": "version:21"},
3333
{"dependency": "curl", "version": "version:7.64.0"},
3434
{"dependency": "avd_cipd_version", "version": "build_id:8719362231152674241"},
3535
{"dependency": "ninja", "version": "version:1.9.0"}
@@ -129,7 +129,7 @@ targets:
129129
dependencies: >-
130130
[
131131
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
132-
{"dependency": "open_jdk", "version": "version:17"}
132+
{"dependency": "open_jdk", "version": "version:21"}
133133
]
134134
env_variables: >-
135135
{
@@ -327,21 +327,21 @@ targets:
327327
timeout: 30
328328
properties:
329329
target_file: analyze_legacy.yaml
330-
channel: "3.32.8"
330+
channel: "3.35.7"
331331
env_variables: >-
332332
{
333-
"CHANNEL": "3.32.8"
333+
"CHANNEL": "3.35.7"
334334
}
335335
336336
- name: Linux analyze_legacy N-2
337337
recipe: packages/packages
338338
timeout: 30
339339
properties:
340340
target_file: analyze_legacy.yaml
341-
channel: "3.29.3"
341+
channel: "3.32.8"
342342
env_variables: >-
343343
{
344-
"CHANNEL": "3.29.3"
344+
"CHANNEL": "3.32.8"
345345
}
346346
347347
- name: Linux_android custom_package_tests master

‎.ci/flutter_master.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
31a8481cd14caa1686487bfacf9d8b1abb6e4cf7
1+
ee23168ddb5d329c5b748b4cc04a5bb0bb293b14

‎.ci/flutter_stable.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
adc901062556672b4138e18a4dc62a4be8f4b3c2
1+
b45fa18946ecc2d9b4009952c636ba7e2ffbb787

‎.ci/targets/repo_checks.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ tasks:
2828
script: .ci/scripts/tool_runner.sh
2929
args:
3030
- "pubspec-check"
31-
- "--min-min-flutter-version=3.27.0"
31+
- "--min-min-flutter-version=3.32.0"
3232
- "--allow-dependencies=script/configs/allowed_unpinned_deps.yaml"
3333
- "--allow-pinned-dependencies=script/configs/allowed_pinned_deps.yaml"
3434
always: true

‎CODEOWNERS‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ packages/espresso/** @jesswrd
7171
packages/file_selector/file_selector_android/** @mboetger
7272
packages/flutter_plugin_android_lifecycle/** @reidbaker
7373
packages/google_maps_flutter/google_maps_flutter_android/** @reidbaker
74-
packages/google_sign_in/google_sign_in_android/** @ash2moon
74+
packages/google_sign_in/google_sign_in_android/** @reidbaker
7575
packages/image_picker/image_picker_android/** @gmackall
7676
packages/in_app_purchase/in_app_purchase_android/** @gmackall
7777
packages/local_auth/local_auth_android/** @mboetger
7878
packages/path_provider/path_provider_android/** @camsim99
79-
packages/quick_actions/quick_actions_android/** @ash2moon
79+
packages/quick_actions/quick_actions_android/** @reidbaker
8080
packages/shared_preferences/shared_preferences_android/** @jesswrd
8181
packages/url_launcher/url_launcher_android/** @gmackall
82-
packages/video_player/video_player_android/** @ash2moon
82+
packages/video_player/video_player_android/** @reidbaker
8383
# Owned by ecosystem team for now during the wrapper evaluation.
8484
packages/webview_flutter/webview_flutter_android/** @bparrishMines
8585

‎packages/animations/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## NEXT
2+
3+
* Updates minimum supported SDK version to Flutter 3.32/Dart 3.8.
4+
15
## 2.1.0
26

37
* Updates examples to use the new RadioGroup API instead of deprecated Radio parameters.

‎packages/animations/example/lib/container_transition.dart‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,9 @@ class _OpenContainerTransformDemoState
8484
onPressed: (int index) {
8585
setModalState(() {
8686
setState(() {
87-
_transitionType =
88-
index == 0
89-
? ContainerTransitionType.fade
90-
: ContainerTransitionType.fadeThrough;
87+
_transitionType = index == 0
88+
? ContainerTransitionType.fade
89+
: ContainerTransitionType.fadeThrough;
9190
});
9291
});
9392
},

‎packages/animations/example/lib/fade_scale_transition.dart‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,19 @@ class _FadeScaleTransitionDemoState extends State<FadeScaleTransitionDemo>
2121

2222
@override
2323
void initState() {
24-
_controller = AnimationController(
25-
value: 0.0,
26-
duration: const Duration(milliseconds: 150),
27-
reverseDuration: const Duration(milliseconds: 75),
28-
vsync: this,
29-
)..addStatusListener((AnimationStatus status) {
30-
setState(() {
31-
// setState needs to be called to trigger a rebuild because
32-
// the 'HIDE FAB'/'SHOW FAB' button needs to be updated based
33-
// the latest value of [_controller.status].
34-
});
35-
});
24+
_controller =
25+
AnimationController(
26+
value: 0.0,
27+
duration: const Duration(milliseconds: 150),
28+
reverseDuration: const Duration(milliseconds: 75),
29+
vsync: this,
30+
)..addStatusListener((AnimationStatus status) {
31+
setState(() {
32+
// setState needs to be called to trigger a rebuild because
33+
// the 'HIDE FAB'/'SHOW FAB' button needs to be updated based
34+
// the latest value of [_controller.status].
35+
});
36+
});
3637
super.initState();
3738
}
3839

@@ -99,10 +100,9 @@ class _FadeScaleTransitionDemoState extends State<FadeScaleTransitionDemo>
99100
_controller.forward();
100101
}
101102
},
102-
child:
103-
_isAnimationRunningForwardsOrComplete
104-
? const Text('HIDE FAB')
105-
: const Text('SHOW FAB'),
103+
child: _isAnimationRunningForwardsOrComplete
104+
? const Text('HIDE FAB')
105+
: const Text('SHOW FAB'),
106106
),
107107
],
108108
),

‎packages/animations/example/lib/fade_through_transition.dart‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,18 @@ class _FadeThroughTransitionDemoState extends State<FadeThroughTransitionDemo> {
2525
return Scaffold(
2626
appBar: AppBar(title: const Text('Fade through')),
2727
body: PageTransitionSwitcher(
28-
transitionBuilder: (
29-
Widget child,
30-
Animation<double> animation,
31-
Animation<double> secondaryAnimation,
32-
) {
33-
return FadeThroughTransition(
34-
animation: animation,
35-
secondaryAnimation: secondaryAnimation,
36-
child: child,
37-
);
38-
},
28+
transitionBuilder:
29+
(
30+
Widget child,
31+
Animation<double> animation,
32+
Animation<double> secondaryAnimation,
33+
) {
34+
return FadeThroughTransition(
35+
animation: animation,
36+
secondaryAnimation: secondaryAnimation,
37+
child: child,
38+
);
39+
},
3940
child: pageList[pageIndex],
4041
),
4142
bottomNavigationBar: BottomNavigationBar(

‎packages/animations/example/lib/shared_axis_transition.dart‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,19 @@ class _SharedAxisTransitionDemoState extends State<SharedAxisTransitionDemo> {
4444
Expanded(
4545
child: PageTransitionSwitcher(
4646
reverse: !_isLoggedIn,
47-
transitionBuilder: (
48-
Widget child,
49-
Animation<double> animation,
50-
Animation<double> secondaryAnimation,
51-
) {
52-
return SharedAxisTransition(
53-
animation: animation,
54-
secondaryAnimation: secondaryAnimation,
55-
transitionType: _transitionType!,
56-
child: child,
57-
);
58-
},
47+
transitionBuilder:
48+
(
49+
Widget child,
50+
Animation<double> animation,
51+
Animation<double> secondaryAnimation,
52+
) {
53+
return SharedAxisTransition(
54+
animation: animation,
55+
secondaryAnimation: secondaryAnimation,
56+
transitionType: _transitionType!,
57+
child: child,
58+
);
59+
},
5960
child: _isLoggedIn ? _CoursePage() : _SignInPage(),
6061
),
6162
),

0 commit comments

Comments
 (0)