Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 8d83b98

Browse files
authored
Roll Dart SDK from 35a9facce191 to e517487c5679 (Dart 3.0) (#38105)
* 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.
1 parent 67254d6 commit 8d83b98

File tree

7 files changed

+16
-8
lines changed

7 files changed

+16
-8
lines changed

DEPS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ vars = {
4848
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
4949
# You can use //tools/dart/create_updated_flutter_deps.py to produce
5050
# updated revision list of existing dependencies.
51-
'dart_revision': '35a9facce1915cd76055740aa106e5c2135c2d55',
51+
'dart_revision': 'e517487c567962e03982e14152f54564c2dcf1e4',
5252

5353
# WARNING: DO NOT EDIT MANUALLY
5454
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -301,7 +301,7 @@ deps = {
301301
Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@ec53f4b2d5b0d52ae703c5b696ecf052ad5fffbb',
302302

303303
'src/third_party/dart/third_party/devtools':
304-
{'packages': [{'version': 'git_revision:dd3fade2bd2ef74fc6102e56333a48f0efc594d3', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'},
304+
{'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:dd3fade2bd2ef74fc6102e56333a48f0efc594d3'}], 'dep_type': 'cipd'},
305305

306306
'src/third_party/dart/third_party/pkg/args':
307307
Var('dart_git') + '/args.git@da037acc018a8dd267d109eb634454490b7ff759',
@@ -466,7 +466,7 @@ deps = {
466466
Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),
467467

468468
'src/third_party/dart/tools/sdks':
469-
{'packages': [{'version': 'version:2.19.0-374.0.dev', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
469+
{'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'version:2.19.0-374.0.dev'}], 'dep_type': 'cipd'},
470470

471471
# WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.
472472

ci/format.bat

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

ci/format.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,8 @@ SRC_DIR="$(cd "$SCRIPT_DIR/../.."; pwd -P)"
3232
DART_SDK_DIR="${SRC_DIR}/third_party/dart/tools/sdks/dart-sdk"
3333
DART="${DART_SDK_DIR}/bin/dart"
3434

35-
# TODO(gspencergoog): Remove --no-sound-null-safety once isolate package is null-safe.
3635
cd "$SCRIPT_DIR"
3736
"$DART" \
3837
--disable-dart-dev \
39-
--no-sound-null-safety \
4038
bin/format.dart \
4139
"$@"

ci/licenses_golden/licenses_third_party

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: b90c42ec04793b821b5f62cd4af4ecb3
1+
Signature: 63cfa049a820981aee7d50bcca19f888
22

33
UNUSED LICENSES:
44

shell/platform/fuchsia/dart_runner/dart_runner.cc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ const char* kDartVMArgs[] = {
5555
#if !defined(DART_PRODUCT) && (!defined(FLUTTER_PROFILE) || !defined(NDEBUG))
5656
"--enable_asserts",
5757
#endif
58+
// Run in unsound null safety mode as some packages used in Integration
59+
// testing have not been migrated yet.
60+
"--no-sound-null-safety",
5861
// clang-format on
5962
};
6063

shell/platform/fuchsia/flutter/component_v1.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,10 @@ ComponentV1::ComponentV1(
425425

426426
settings_.dart_flags = {};
427427

428+
// Run in unsound null safety mode as some packages used in Integration
429+
// testing have not been migrated yet.
430+
settings_.dart_flags.push_back("--no-sound-null-safety");
431+
428432
// Don't collect CPU samples from Dart VM C++ code.
429433
settings_.dart_flags.push_back("--no_profile_vm");
430434

shell/platform/fuchsia/flutter/component_v2.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,10 @@ ComponentV2::ComponentV2(
488488

489489
settings_.dart_flags = {};
490490

491+
// Run in unsound null safety mode as some packages used in Integration
492+
// testing have not been migrated yet.
493+
settings_.dart_flags.push_back("--no-sound-null-safety");
494+
491495
// Don't collect CPU samples from Dart VM C++ code.
492496
settings_.dart_flags.push_back("--no_profile_vm");
493497

0 commit comments

Comments
 (0)