DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Roll Dart SDK from 35a9facce191 to e517487c5679 (Dart 3.0) (flutter/engine#38105)

Browse Source 
* Remove uses of --no-sound-null-safety in preparation for the Dart 3.0
roll.

* Update quiver package to latest.

* Run Fuchsia engine in null safe mode.

* Run Fuchsia engine in non null safe mode.

* Update Dart version to 3.0

* Address review comments.
This commit is contained in:
Siva 2022-12-06 20:38:02 -08:00 committed by GitHub
parent 0687bec1e9
commit aac2690ea4
6 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DEPS
View File

@ -48,7 +48,7 @@ vars = {
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
# You can use //tools/dart/create_updated_flutter_deps.py to produce
# updated revision list of existing dependencies.
'dart_revision': '35a9facce1915cd76055740aa106e5c2135c2d55',
'dart_revision': 'e517487c567962e03982e14152f54564c2dcf1e4',
# WARNING: DO NOT EDIT MANUALLY
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@ -301,7 +301,7 @@ deps = {
Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@ec53f4b2d5b0d52ae703c5b696ecf052ad5fffbb',
'src/third_party/dart/third_party/devtools':
{'packages': [{'version': 'git_revision:dd3fade2bd2ef74fc6102e56333a48f0efc594d3', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'},
{'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:dd3fade2bd2ef74fc6102e56333a48f0efc594d3'}], 'dep_type': 'cipd'},
'src/third_party/dart/third_party/pkg/args':
Var('dart_git') + '/args.git@da037acc018a8dd267d109eb634454490b7ff759',
@ -466,7 +466,7 @@ deps = {
Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),
'src/third_party/dart/tools/sdks':
{'packages': [{'version': 'version:2.19.0-374.0.dev', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
{'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'version:2.19.0-374.0.dev'}], 'dep_type': 'cipd'},
# WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.

3
engine/src/flutter/ci/format.bat
View File

@ -28,5 +28,4 @@ cd "%ci_dir%"
REM Do not use the CALL command in the next line to execute Dart. CALL causes
REM Windows to re-read the line from disk after the CALL command has finished
REM regardless of the ampersand chain.
REM TODO(gspencergoog): Remove --no-sound-null-safety once isolate package is null-safe.
"%dart%" --no-sound-null-safety --disable-dart-dev bin\format.dart %* & exit /B !ERRORLEVEL!
"%dart%" --disable-dart-dev bin\format.dart %* & exit /B !ERRORLEVEL!

2
engine/src/flutter/ci/format.sh
View File

@ -32,10 +32,8 @@ SRC_DIR="$(cd "$SCRIPT_DIR/../.."; pwd -P)"
DART_SDK_DIR="${SRC_DIR}/third_party/dart/tools/sdks/dart-sdk"
DART="${DART_SDK_DIR}/bin/dart"
# TODO(gspencergoog): Remove --no-sound-null-safety once isolate package is null-safe.
cd "$SCRIPT_DIR"
"$DART" \
--disable-dart-dev \
--no-sound-null-safety \
bin/format.dart \
"$@"

3
engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_runner.cc
View File

@ -55,6 +55,9 @@ const char* kDartVMArgs[] = {
#if !defined(DART_PRODUCT) && (!defined(FLUTTER_PROFILE) || !defined(NDEBUG))
"--enable_asserts",
#endif
// Run in unsound null safety mode as some packages used in Integration
// testing have not been migrated yet.
"--no-sound-null-safety",
// clang-format on
};

4
engine/src/flutter/shell/platform/fuchsia/flutter/component_v1.cc
View File

@ -425,6 +425,10 @@ ComponentV1::ComponentV1(
settings_.dart_flags = {};
// Run in unsound null safety mode as some packages used in Integration
// testing have not been migrated yet.
settings_.dart_flags.push_back("--no-sound-null-safety");
// Don't collect CPU samples from Dart VM C++ code.
settings_.dart_flags.push_back("--no_profile_vm");

4
engine/src/flutter/shell/platform/fuchsia/flutter/component_v2.cc
View File

@ -488,6 +488,10 @@ ComponentV2::ComponentV2(
settings_.dart_flags = {};
// Run in unsound null safety mode as some packages used in Integration
// testing have not been migrated yet.
settings_.dart_flags.push_back("--no-sound-null-safety");
// Don't collect CPU samples from Dart VM C++ code.
settings_.dart_flags.push_back("--no_profile_vm");