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 to Dart SDK 3.9 Beta 1 (#168559)

Browse Source 
Roll to dart sdk 3.9 beta 1 plus the fix for native resolver not having
an isolate
This commit is contained in:
Alexander Aprelev 2025-05-08 13:56:07 -07:00 committed by GitHub
parent b0ad252b7a
commit 201893ed94
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
DEPS
View File

@ -56,16 +56,16 @@ 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': '8dc0ecee5adca1ee54205915a4ef66e40a21333f',
'dart_revision': '0bea6379f654c11835d3c2bde7cf7128206d36d6',
# WARNING: DO NOT EDIT MANUALLY
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
'dart_binaryen_rev': 'b4bdcc33115b31758c56b83bb9de4642c411a042',
'dart_boringssl_rev': 'a70ec8dd2cc1816e9deadda2f6e536640380e20c',
'dart_core_rev': '635dfa32c261ba078438b74de397f2207904ca78',
'dart_devtools_rev': '4b7eda127290518ad9e0dea4dcb9510b6e5e4a41',
'dart_devtools_rev': '21132242f6e12b26e3d9c0f06109361f7e519608',
'dart_ecosystem_rev': '815d4ba2e7d11f8695a26f6cbe1262e3b8ff8d0d',
'dart_http_rev': '63c477b466f650e8f5505d6d78dc283c2c2f9845',
'dart_http_rev': '78d6114f460ac2d7ed085773ccaec65611638095',
'dart_i18n_rev': 'e44af5483a051d546716b6aa3a57e478c59a5d8d',
'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
@ -74,7 +74,7 @@ vars = {
'dart_pub_rev': 'b2c03b448a47fdd52800609b9222cd737be3a934',
'dart_sync_http_rev': 'dc54465f07d9652875deeade643256dafa2fbc6c',
'dart_tools_rev': '92f10a9ace39fceff212c64cbb2c10fae99ca7b8',
'dart_vector_math_rev': '39cafd45346f355a6e4c38a17c89fcd199dc1c96',
'dart_vector_math_rev': '0279cb83324c4e7d03684effe1bfb0c8ac5bebed',
'dart_web_rev': 'f1becf07db9faa56559d2844c3c6d430dc9b37de',
'dart_webdev_rev': '5bf833d0c277a384ab8bbfc10e7d3d71b8022560',
'dart_webdriver_rev': 'f52afbf72895ae980bd4129d877305c2182d6cbc',
@ -304,7 +304,7 @@ deps = {
Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@b4bdcc33115b31758c56b83bb9de4642c411a042',
'engine/src/flutter/third_party/dart/third_party/devtools':
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:4b7eda127290518ad9e0dea4dcb9510b6e5e4a41'}]},
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:21132242f6e12b26e3d9c0f06109361f7e519608'}]},
'engine/src/flutter/third_party/dart/third_party/pkg/core':
Var('dart_git') + '/core.git' + '@' + Var('dart_core_rev'),
@ -313,7 +313,7 @@ deps = {
Var('dart_git') + '/dart_style.git@100db45075abdd66fd8788b205243e90ff0595df',
'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc':
Var('dart_git') + '/dartdoc.git@95105e9211eb720c81379825d85289ec4d775075',
Var('dart_git') + '/dartdoc.git@e4f9451a871055dad57fd9283c5eb3086bbe56c7',
'engine/src/flutter/third_party/dart/third_party/pkg/ecosystem':
Var('dart_git') + '/ecosystem.git' + '@' + Var('dart_ecosystem_rev'),
@ -346,7 +346,7 @@ deps = {
Var('dart_git') + '/external/github.com/simolus3/tar.git@5a1ea943e70cdf3fa5e1102cdbb9418bd9b4b81a',
'engine/src/flutter/third_party/dart/third_party/pkg/test':
Var('dart_git') + '/test.git@c3755d8057f29318e31f55e86b3a74d1a48f5d0a',
Var('dart_git') + '/test.git@55d1f9ed414bc01b0ffefa64644aa7756142db58',
'engine/src/flutter/third_party/dart/third_party/pkg/tools':
Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),

4
engine/src/flutter/ci/licenses_golden/licenses_dart
View File

@ -1,4 +1,4 @@
Signature: 16832fe6a4e0928a778bf36397cbdff5
Signature: 6d7ec85f0e954ed13dbe603f947d6d73
====================================================================================================
LIBRARY: dart
@ -4868,7 +4868,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
This Source Code Form is "Incompatible With Secondary Licenses", as
defined by the Mozilla Public License, v. 2.0.
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/8dc0ecee5adca1ee54205915a4ef66e40a21333f
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/0bea6379f654c11835d3c2bde7cf7128206d36d6
/third_party/fallback_root_certificates/
====================================================================================================

10
engine/src/flutter/testing/test_dart_native_resolver.cc
View File

@ -46,7 +46,7 @@ void* TestDartNativeResolver::ResolveFfiCallback(
}
static std::mutex gIsolateResolversMutex;
static std::map<Dart_Isolate, std::weak_ptr<TestDartNativeResolver>>
static std::map<Dart_IsolateGroup, std::weak_ptr<TestDartNativeResolver>>
gIsolateResolvers;
Dart_NativeFunction TestDartNativeResolver::DartNativeEntryResolverCallback(
@ -56,7 +56,7 @@ Dart_NativeFunction TestDartNativeResolver::DartNativeEntryResolverCallback(
auto name = tonic::StdStringFromDart(dart_name);
std::scoped_lock lock(gIsolateResolversMutex);
auto found = gIsolateResolvers.find(Dart_CurrentIsolate());
auto found = gIsolateResolvers.find(Dart_CurrentIsolateGroup());
if (found == gIsolateResolvers.end()) {
FML_LOG(ERROR) << "Could not resolve native method for :" << name;
return nullptr;
@ -80,7 +80,7 @@ static const uint8_t* DartNativeEntrySymbolCallback(
void* TestDartNativeResolver::FfiNativeResolver(const char* name,
uintptr_t args_n) {
std::scoped_lock lock(gIsolateResolversMutex);
auto found = gIsolateResolvers.find(Dart_CurrentIsolate());
auto found = gIsolateResolvers.find(Dart_CurrentIsolateGroup());
if (found == gIsolateResolvers.end()) {
FML_LOG(ERROR) << "Could not resolve native method for :" << name;
return nullptr;
@ -109,9 +109,9 @@ void TestDartNativeResolver::SetNativeResolverForIsolate() {
<< "Could not set FFI native resolver in test.";
std::scoped_lock lock(gIsolateResolversMutex);
gIsolateResolvers[Dart_CurrentIsolate()] = shared_from_this();
gIsolateResolvers[Dart_CurrentIsolateGroup()] = shared_from_this();
std::vector<Dart_Isolate> isolates_with_dead_resolvers;
std::vector<Dart_IsolateGroup> isolates_with_dead_resolvers;
for (const auto& entry : gIsolateResolvers) {
if (!entry.second.lock()) {
isolates_with_dead_resolvers.push_back(entry.first);