Skip to content

Commit fc1cb04

Browse files
zmtzawqlpzmtzawqlp
committed
* Migrate to Flutter 3.10.0 and Dart 3.0.0 (#557,#563,#570,#572,#573)
* Cherry Pick flutter/flutter#110131 * Cherry Pick flutter/flutter#119495
1 parent 7a8d578 commit fc1cb04

Some content is hidden

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

62 files changed

+2041
-1584
lines changed

‎CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
## 8.0.1
2+
3+
* Dart sdk: '>=2.18.0 <4.0.0'
4+
5+
## 8.0.0
6+
7+
* Migrate to Flutter 3.10.0 and Dart 3.0.0 (#557,#563,#570,#572,#573)
8+
* Cherry Pick https://github.com/flutter/flutter/pull/110131
9+
* Cherry Pick https://github.com/flutter/flutter/pull/119495
10+
111
## 7.0.2
212

313
* publish v6.4.1 for flutter 3.3.0 and v6.2.2 for flutter 3.0.5

‎analysis_options.yaml

-5
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
# Android Studio, and the `flutter analyze` command.
2020

2121
analyzer:
22-
strong-mode:
23-
implicit-casts: false
24-
implicit-dynamic: false
2522
errors:
2623
# treat missing required parameters as a warning (not a hint)
2724
missing_required_param: warning
@@ -139,10 +136,8 @@ linter:
139136
# - prefer_constructors_over_static_methods # not yet tested
140137
- prefer_contains
141138
# - prefer_double_quotes # opposite of prefer_single_quotes
142-
- prefer_equal_for_default_values
143139
# - prefer_expression_function_bodies # conflicts with https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#consider-using--for-short-functions-and-methods
144140
- prefer_final_fields
145-
- prefer_final_in_for_each
146141
- prefer_final_locals
147142
- prefer_for_elements_to_map_fromIterable
148143
- prefer_foreach

‎example/.metadata

+38-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,45 @@
11
# This file tracks properties of this Flutter project.
22
# Used by Flutter tool to assess capabilities and perform upgrades etc.
33
#
4-
# This file should be version controlled and should not be manually edited.
4+
# This file should be version controlled.
55

66
version:
7-
revision: 63b2daff7f91afeaac47f3646f59eefd59210c41
8-
channel: unknown
7+
revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
8+
channel: stable
99

1010
project_type: app
11+
12+
# Tracks metadata for the flutter migrate command
13+
migration:
14+
platforms:
15+
- platform: root
16+
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
17+
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
18+
- platform: android
19+
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
20+
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
21+
- platform: ios
22+
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
23+
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
24+
- platform: linux
25+
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
26+
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
27+
- platform: macos
28+
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
29+
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
30+
- platform: web
31+
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
32+
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
33+
- platform: windows
34+
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
35+
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
36+
37+
# User provided section
38+
39+
# List of Local paths (relative to this file) that should be
40+
# ignored by the migrate tool.
41+
#
42+
# Files that are not part of the templates will be ignored by default.
43+
unmanaged_files:
44+
- 'lib/main.dart'
45+
- 'ios/Runner.xcodeproj/project.pbxproj'

‎example/analysis_options.yaml

+1-4
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
# Android Studio, and the `flutter analyze` command.
2020

2121
analyzer:
22-
strong-mode:
23-
implicit-casts: false
24-
implicit-dynamic: false
2522
errors:
2623
# treat missing required parameters as a warning (not a hint)
2724
missing_required_param: warning
@@ -141,7 +138,7 @@ linter:
141138
# - prefer_constructors_over_static_methods # not yet tested
142139
- prefer_contains
143140
# - prefer_double_quotes # opposite of prefer_single_quotes
144-
- prefer_equal_for_default_values
141+
# - prefer_equal_for_default_values
145142
# - prefer_expression_function_bodies # conflicts with https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#consider-using--for-short-functions-and-methods
146143
- prefer_final_fields
147144
- prefer_final_in_for_each

‎example/android/app/src/debug/AndroidManifest.xml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2+
<!-- The INTERNET permission is required for development. Specifically,
3+
the Flutter tool needs it to communicate with the running application
4+
to allow setting breakpoints, to provide hot reload, etc.
5+
-->
6+
<uses-permission android:name="android.permission.INTERNET"/>
7+
</manifest>

‎example/android/app/src/main/kotlin/com/fluttercandies/example/MainActivity.kt

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package com.fluttercandies.example
2+
3+
import io.flutter.embedding.android.FlutterActivity
4+
5+
class MainActivity: FlutterActivity() {
6+
}

‎example/android/app/src/profile/AndroidManifest.xml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2+
<!-- The INTERNET permission is required for development. Specifically,
3+
the Flutter tool needs it to communicate with the running application
4+
to allow setting breakpoints, to provide hot reload, etc.
5+
-->
6+
<uses-permission android:name="android.permission.INTERNET"/>
7+
</manifest>

‎example/android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ subprojects {
2727
project.evaluationDependsOn(':app')
2828
}
2929

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

‎example/ios/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
**/dgph
12
*.mode1v3
23
*.mode2v3
34
*.moved-aside
@@ -18,6 +19,7 @@ Flutter/App.framework
1819
Flutter/Flutter.framework
1920
Flutter/Flutter.podspec
2021
Flutter/Generated.xcconfig
22+
Flutter/ephemeral/
2123
Flutter/app.flx
2224
Flutter/app.zip
2325
Flutter/flutter_assets/

‎example/ios/Flutter/.last_build_id

-1
This file was deleted.

‎example/ios/Flutter/AppFrameworkInfo.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<plist version="1.0">
44
<dict>
55
<key>CFBundleDevelopmentRegion</key>
6-
<string>$(DEVELOPMENT_LANGUAGE)</string>
6+
<string>en</string>
77
<key>CFBundleExecutable</key>
88
<string>App</string>
99
<key>CFBundleIdentifier</key>

‎example/ios/Flutter/Debug.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
1+
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
22
#include "Generated.xcconfig"

‎example/ios/Flutter/Release.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
1+
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
22
#include "Generated.xcconfig"

‎example/ios/Podfile

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
platform :ios, '9.1'
2+
platform :ios, '11.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -32,6 +32,9 @@ target 'Runner' do
3232
use_modular_headers!
3333

3434
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
35+
target 'RunnerTests' do
36+
inherit! :search_paths
37+
end
3538
end
3639

3740
post_install do |installer|

0 commit comments

Comments
 (0)