Skip to content

Commit 36e7a6a

Browse files
domesticmouseditmanMarkTechsonjohnpryan
authored
Update for Flutter 3.10 beta (#1746)
## Pre-launch Checklist - [x] I read the [Flutter Style Guide] _recently_, and have followed its advice. - [x] I signed the [CLA]. - [x] I read the [Contributors Guide]. - [x] I updated/added relevant documentation (doc comments with `///`). - [ ] All existing and new tests are passing. --------- Co-authored-by: David Iglesias <[email protected]> Co-authored-by: Mark Thompson <[email protected]> Co-authored-by: John Ryan <[email protected]>
1 parent 474756c commit 36e7a6a

File tree

188 files changed

+1777
-1966
lines changed

Some content is hidden

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

188 files changed

+1777
-1966
lines changed

analysis_defaults/lib/flutter.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@ linter:
1717
test_types_in_equals: true
1818
throw_in_finally: true
1919
unawaited_futures: true
20+
unnecessary_breaks: true
2021
unnecessary_statements: true
2122
use_super_parameters: true

analysis_defaults/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Analysis defaults for flutter/samples
33
publish_to: none
44

55
environment:
6-
sdk: '>=2.19.5 <4.0.0'
6+
sdk: ^3.0.0-0
77

88
# NOTE: Code is not allowed in this package. Do not add dependencies.
99
dependencies:

android_splash_screen/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ publish_to: "none"
66
version: 1.0.0+1
77

88
environment:
9-
sdk: '>=2.19.5 <4.0.0'
9+
sdk: ^3.0.0-0
1010

1111
dependencies:
1212
flutter:

animations/.metadata

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This file should be version controlled.
55

66
version:
7-
revision: f732038a8cf4562ce38a1d7debb30209ae3da896
7+
revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
88
channel: beta
99

1010
project_type: app
@@ -13,26 +13,26 @@ project_type: app
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
17-
base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
16+
create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
17+
base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
1818
- platform: android
19-
create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
20-
base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
19+
create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
20+
base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
2121
- platform: ios
22-
create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
23-
base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
22+
create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
23+
base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
2424
- platform: linux
25-
create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
26-
base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
25+
create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
26+
base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
2727
- platform: macos
28-
create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
29-
base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
28+
create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
29+
base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
3030
- platform: web
31-
create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
32-
base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
31+
create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
32+
base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
3333
- platform: windows
34-
create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
35-
base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
34+
create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
35+
base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
3636

3737
# User provided section
3838

animations/android/app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ apply plugin: 'kotlin-android'
2626
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2727

2828
android {
29+
namespace "dev.flutter.animations"
2930
compileSdkVersion flutter.compileSdkVersion
3031
ndkVersion flutter.ndkVersion
3132

animations/android/app/src/debug/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="dev.flutter.animations">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!-- The INTERNET permission is required for development. Specifically,
43
the Flutter tool needs it to communicate with the running application
54
to allow setting breakpoints, to provide hot reload, etc.

animations/android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="dev.flutter.animations">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<application
43
android:label="animations"
54
android:name="${applicationName}"

animations/android/app/src/profile/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="dev.flutter.animations">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!-- The INTERNET permission is required for development. Specifically,
43
the Flutter tool needs it to communicate with the running application
54
to allow setting breakpoints, to provide hot reload, etc.

animations/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ subprojects {
2626
project.evaluationDependsOn(':app')
2727
}
2828

29-
task clean(type: Delete) {
29+
tasks.register("clean", Delete) {
3030
delete rootProject.buildDir
3131
}

animations/lib/src/basics/animated_builder.dart

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,11 @@ class _AnimatedBuilderDemoState extends State<AnimatedBuilderDemo>
5454
),
5555
child: child,
5656
onPressed: () {
57-
if (controller.status == AnimationStatus.completed) {
58-
controller.reverse();
59-
} else {
60-
controller.forward();
57+
switch (controller.status) {
58+
case AnimationStatus.completed:
59+
controller.reverse();
60+
default:
61+
controller.forward();
6162
}
6263
},
6364
);

0 commit comments

Comments
 (0)