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

Commit 44fe215

Browse files
authored
Manual roll of Dart. (#54983)
[https://dart.googlesource.com/sdk.git/+log/1a6246225b75..0f783bdb7a4d ](https://dart.googlesource.com/sdk.git/+log/1a6246225b75..0f783bdb7a4d ) Merging Version 3.6.0-217.0.dev The change https://dart-review.googlesource.com/c/sdk/+/382385 moved some package locations and these had to be adjusted in the Flutter DEPS file.
1 parent 19d2eb4 commit 44fe215

File tree

4 files changed

+7
-15
lines changed

4 files changed

+7
-15
lines changed

DEPS

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ vars = {
5656
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
5757
# You can use //tools/dart/create_updated_flutter_deps.py to produce
5858
# updated revision list of existing dependencies.
59-
'dart_revision': '1a6246225b75aae44a5cba2b98ee6d55ecfc89b6',
59+
'dart_revision': '0f783bdb7a4d7b73187fe5d2971eb98149235c80',
6060

6161
# WARNING: DO NOT EDIT MANUALLY
6262
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -72,7 +72,7 @@ vars = {
7272
'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
7373
'dart_protobuf_rev': 'ccf104dbc36929c0f8708285d5f3a8fae206343e',
7474
'dart_pub_rev': '31fa75baa5872e7f094a554c0ec7741742889530',
75-
'dart_tools_rev': '5b15f8b60bf950a2f06dad3258dee61c153fdb44',
75+
'dart_tools_rev': 'b98c535537101eff0484ba279bd4090a5b9ac2ad',
7676
'dart_watcher_rev': '0484625589d8512b36a7ad898a6cc6351d24c556',
7777
'dart_web_rev': '4996dc2acd30ff06f7e500ec76fde8a66db82c0c',
7878
'dart_webdev_rev': '75417c09181c97786d9539a662834bed9d2f1e77',
@@ -202,7 +202,6 @@ vars = {
202202
"upstream_logging": "https://github.com/dart-lang/logging.git",
203203
"upstream_markdown": "https://github.com/dart-lang/markdown.git",
204204
"upstream_matcher": "https://github.com/dart-lang/matcher.git",
205-
"upstream_mime": "https://github.com/dart-lang/mime.git",
206205
"upstream_mockito": "https://github.com/dart-lang/mockito.git",
207206
"upstream_ocmock": "https://github.com/erikdoe/ocmock.git",
208207
"upstream_package_config": "https://github.com/dart-lang/package_config.git",
@@ -222,7 +221,6 @@ vars = {
222221
"upstream_shaderc": "https://github.com/google/shaderc.git",
223222
"upstream_shelf": "https://github.com/dart-lang/shelf.git",
224223
"upstream_skia": "https://skia.googlesource.com/skia.git",
225-
"upstream_source_map_stack_trace": "https://github.com/dart-lang/source_map_stack_trace.git",
226224
"upstream_source_maps": "https://github.com/dart-lang/source_maps.git",
227225
"upstream_source_span": "https://github.com/dart-lang/source_span.git",
228226
"upstream_sqlite": "https://github.com/sqlite/sqlite.git",
@@ -430,9 +428,6 @@ deps = {
430428
'src/flutter/third_party/dart/third_party/pkg/matcher':
431429
Var('dart_git') + '/matcher.git@d6d573d0f8d65b36550ce62aad3ce6b5e987b642',
432430

433-
'src/flutter/third_party/dart/third_party/pkg/mime':
434-
Var('dart_git') + '/mime.git@11fec7d6df509a4efd554051cc27e3bf82df9c96',
435-
436431
'src/flutter/third_party/dart/third_party/pkg/mockito':
437432
Var('dart_git') + '/mockito.git@eb4d1daa20c105c94ac29689c1975f0850fa18f2',
438433

@@ -460,9 +455,6 @@ deps = {
460455
'src/flutter/third_party/dart/third_party/pkg/shelf':
461456
Var('dart_git') + '/shelf.git@9f2dffecbe8f219146a077e401758602752d486a',
462457

463-
'src/flutter/third_party/dart/third_party/pkg/source_map_stack_trace':
464-
Var('dart_git') + '/source_map_stack_trace.git@741b6ceb4b6cdb8ff620664337d7ecc63ca52cc1',
465-
466458
'src/flutter/third_party/dart/third_party/pkg/source_maps':
467459
Var('dart_git') + '/source_maps.git@5f82c613664ade03c7a6d0e6c59687c69dec894b',
468460

ci/licenses_golden/licenses_dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 2b488f1b7fc93b69b4f89d69211da628
1+
Signature: 0d1eb1503a6d5425fca3b40d86a66cfb
22

33
====================================================================================================
44
LIBRARY: dart
@@ -4785,7 +4785,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
47854785
This Source Code Form is "Incompatible With Secondary Licenses", as
47864786
defined by the Mozilla Public License, v. 2.0.
47874787

4788-
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/1a6246225b75aae44a5cba2b98ee6d55ecfc89b6
4788+
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/0f783bdb7a4d7b73187fe5d2971eb98149235c80
47894789
/third_party/fallback_root_certificates/
47904790

47914791
====================================================================================================

pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ dependency_overrides:
235235
metrics_center:
236236
path: ./third_party/pkg/flutter_packages/packages/metrics_center
237237
mime:
238-
path: ./third_party/dart/third_party/pkg/mime
238+
path: ./third_party/dart/third_party/pkg/tools/pkgs/mime
239239
node_preamble:
240240
path: ./third_party/pkg/node_preamble
241241
package_config:
@@ -267,7 +267,7 @@ dependency_overrides:
267267
smith:
268268
path: ./third_party/dart/pkg/smith
269269
source_map_stack_trace:
270-
path: ./third_party/dart/third_party/pkg/source_map_stack_trace
270+
path: ./third_party/dart/third_party/pkg/tools/pkgs/source_map_stack_trace
271271
source_maps:
272272
path: ./third_party/dart/third_party/pkg/source_maps
273273
source_span:

sky/packages/sky_engine/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32054,7 +32054,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
3205432054
This Source Code Form is "Incompatible With Secondary Licenses", as
3205532055
defined by the Mozilla Public License, v. 2.0.
3205632056

32057-
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/1a6246225b75aae44a5cba2b98ee6d55ecfc89b6
32057+
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/0f783bdb7a4d7b73187fe5d2971eb98149235c80
3205832058
/third_party/fallback_root_certificates/
3205932059

3206032060
--------------------------------------------------------------------------------

0 commit comments

Comments
 (0)