diff --git a/DEPS b/DEPS index 269e2fb691f1b..2f4336142204e 100644 --- a/DEPS +++ b/DEPS @@ -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. diff --git a/ci/format.bat b/ci/format.bat index d82d64cec0221..35451118bc58e 100644 --- a/ci/format.bat +++ b/ci/format.bat @@ -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! diff --git a/ci/format.sh b/ci/format.sh index 50475df4df335..0425eb380eb7c 100755 --- a/ci/format.sh +++ b/ci/format.sh @@ -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 \ "$@" diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 723e8af790515..15801936dc0a4 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: b90c42ec04793b821b5f62cd4af4ecb3 +Signature: 63cfa049a820981aee7d50bcca19f888 UNUSED LICENSES: diff --git a/shell/platform/fuchsia/dart_runner/dart_runner.cc b/shell/platform/fuchsia/dart_runner/dart_runner.cc index c75e5c22556fb..eebe34ec5deef 100644 --- a/shell/platform/fuchsia/dart_runner/dart_runner.cc +++ b/shell/platform/fuchsia/dart_runner/dart_runner.cc @@ -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 }; diff --git a/shell/platform/fuchsia/flutter/component_v1.cc b/shell/platform/fuchsia/flutter/component_v1.cc index bc58d846538f9..a024974c13b84 100644 --- a/shell/platform/fuchsia/flutter/component_v1.cc +++ b/shell/platform/fuchsia/flutter/component_v1.cc @@ -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"); diff --git a/shell/platform/fuchsia/flutter/component_v2.cc b/shell/platform/fuchsia/flutter/component_v2.cc index 09fce7e806458..93504818d8915 100644 --- a/shell/platform/fuchsia/flutter/component_v2.cc +++ b/shell/platform/fuchsia/flutter/component_v2.cc @@ -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");