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

Manual roll of Dart. (flutter/engine#54983)

Browse Source 
[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.
This commit is contained in:
Siva 2024-09-05 16:33:44 -07:00 committed by GitHub
parent 0669d07612
commit 5084e0ca2b
4 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
DEPS
View File

@ -56,7 +56,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': '1a6246225b75aae44a5cba2b98ee6d55ecfc89b6',
'dart_revision': '0f783bdb7a4d7b73187fe5d2971eb98149235c80',
# WARNING: DO NOT EDIT MANUALLY
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@ -72,7 +72,7 @@ vars = {
'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
'dart_protobuf_rev': 'ccf104dbc36929c0f8708285d5f3a8fae206343e',
'dart_pub_rev': '31fa75baa5872e7f094a554c0ec7741742889530',
'dart_tools_rev': '5b15f8b60bf950a2f06dad3258dee61c153fdb44',
'dart_tools_rev': 'b98c535537101eff0484ba279bd4090a5b9ac2ad',
'dart_watcher_rev': '0484625589d8512b36a7ad898a6cc6351d24c556',
'dart_web_rev': '4996dc2acd30ff06f7e500ec76fde8a66db82c0c',
'dart_webdev_rev': '75417c09181c97786d9539a662834bed9d2f1e77',
@ -202,7 +202,6 @@ vars = {
"upstream_logging": "https://github.com/dart-lang/logging.git",
"upstream_markdown": "https://github.com/dart-lang/markdown.git",
"upstream_matcher": "https://github.com/dart-lang/matcher.git",
"upstream_mime": "https://github.com/dart-lang/mime.git",
"upstream_mockito": "https://github.com/dart-lang/mockito.git",
"upstream_ocmock": "https://github.com/erikdoe/ocmock.git",
"upstream_package_config": "https://github.com/dart-lang/package_config.git",
@ -222,7 +221,6 @@ vars = {
"upstream_shaderc": "https://github.com/google/shaderc.git",
"upstream_shelf": "https://github.com/dart-lang/shelf.git",
"upstream_skia": "https://skia.googlesource.com/skia.git",
"upstream_source_map_stack_trace": "https://github.com/dart-lang/source_map_stack_trace.git",
"upstream_source_maps": "https://github.com/dart-lang/source_maps.git",
"upstream_source_span": "https://github.com/dart-lang/source_span.git",
"upstream_sqlite": "https://github.com/sqlite/sqlite.git",
@ -430,9 +428,6 @@ deps = {
'src/flutter/third_party/dart/third_party/pkg/matcher':
Var('dart_git') + '/matcher.git@d6d573d0f8d65b36550ce62aad3ce6b5e987b642',
'src/flutter/third_party/dart/third_party/pkg/mime':
Var('dart_git') + '/mime.git@11fec7d6df509a4efd554051cc27e3bf82df9c96',
'src/flutter/third_party/dart/third_party/pkg/mockito':
Var('dart_git') + '/mockito.git@eb4d1daa20c105c94ac29689c1975f0850fa18f2',
@ -460,9 +455,6 @@ deps = {
'src/flutter/third_party/dart/third_party/pkg/shelf':
Var('dart_git') + '/shelf.git@9f2dffecbe8f219146a077e401758602752d486a',
'src/flutter/third_party/dart/third_party/pkg/source_map_stack_trace':
Var('dart_git') + '/source_map_stack_trace.git@741b6ceb4b6cdb8ff620664337d7ecc63ca52cc1',
'src/flutter/third_party/dart/third_party/pkg/source_maps':
Var('dart_git') + '/source_maps.git@5f82c613664ade03c7a6d0e6c59687c69dec894b',

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

@ -1,4 +1,4 @@
Signature: 2b488f1b7fc93b69b4f89d69211da628
Signature: 0d1eb1503a6d5425fca3b40d86a66cfb
====================================================================================================
LIBRARY: dart
@ -4785,7 +4785,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/+/1a6246225b75aae44a5cba2b98ee6d55ecfc89b6
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/0f783bdb7a4d7b73187fe5d2971eb98149235c80
/third_party/fallback_root_certificates/
====================================================================================================

4
engine/src/flutter/pubspec.yaml
View File

@ -235,7 +235,7 @@ dependency_overrides:
metrics_center:
path: ./third_party/pkg/flutter_packages/packages/metrics_center
mime:
path: ./third_party/dart/third_party/pkg/mime
path: ./third_party/dart/third_party/pkg/tools/pkgs/mime
node_preamble:
path: ./third_party/pkg/node_preamble
package_config:
@ -267,7 +267,7 @@ dependency_overrides:
smith:
path: ./third_party/dart/pkg/smith
source_map_stack_trace:
path: ./third_party/dart/third_party/pkg/source_map_stack_trace
path: ./third_party/dart/third_party/pkg/tools/pkgs/source_map_stack_trace
source_maps:
path: ./third_party/dart/third_party/pkg/source_maps
source_span:

2
engine/src/flutter/sky/packages/sky_engine/LICENSE
View File

@ -32054,7 +32054,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/+/1a6246225b75aae44a5cba2b98ee6d55ecfc89b6
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/0f783bdb7a4d7b73187fe5d2971eb98149235c80
/third_party/fallback_root_certificates/
--------------------------------------------------------------------------------