Skip to content

Commit 177911f

Browse files
committed
Version 2.15.0-268.1.beta
Merge '2.15.0-268.0.dev' into beta
2 parents bfadad7 + 3b11f88 commit 177911f

File tree

2,243 files changed

+182442
-70797
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,243 files changed

+182442
-70797
lines changed

.dart_tool/package_config.json

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"constraint, update this by running tools/generate_package_config.dart."
1212
],
1313
"configVersion": 2,
14-
"generated": "2021-10-03T09:32:39.517171",
14+
"generated": "2021-10-26T10:20:01.277340",
1515
"generator": "tools/generate_package_config.dart",
1616
"packages": [
1717
{
@@ -208,7 +208,7 @@
208208
"name": "dart2js_info",
209209
"rootUri": "../pkg/dart2js_info",
210210
"packageUri": "lib/",
211-
"languageVersion": "2.3"
211+
"languageVersion": "2.11"
212212
},
213213
{
214214
"name": "dart2js_runtime_metrics",
@@ -220,7 +220,7 @@
220220
"name": "dart2js_tools",
221221
"rootUri": "../pkg/dart2js_tools",
222222
"packageUri": "lib/",
223-
"languageVersion": "2.3"
223+
"languageVersion": "2.12"
224224
},
225225
{
226226
"name": "dart2native",
@@ -470,7 +470,7 @@
470470
"name": "native_stack_traces",
471471
"rootUri": "../pkg/native_stack_traces",
472472
"packageUri": "lib/",
473-
"languageVersion": "2.12"
473+
"languageVersion": "2.14"
474474
},
475475
{
476476
"name": "nnbd_migration",
@@ -515,7 +515,7 @@
515515
{
516516
"name": "package_deps",
517517
"rootUri": "../tools/package_deps",
518-
"languageVersion": "2.8"
518+
"languageVersion": "2.12"
519519
},
520520
{
521521
"name": "path",
@@ -565,12 +565,6 @@
565565
"packageUri": "lib/",
566566
"languageVersion": "2.12"
567567
},
568-
{
569-
"name": "resource",
570-
"rootUri": "../third_party/pkg/resource",
571-
"packageUri": "lib/",
572-
"languageVersion": "2.0"
573-
},
574568
{
575569
"name": "scrape",
576570
"rootUri": "../pkg/scrape",
@@ -629,7 +623,7 @@
629623
"name": "source_maps",
630624
"rootUri": "../third_party/pkg/source_maps",
631625
"packageUri": "lib/",
632-
"languageVersion": "2.10"
626+
"languageVersion": "2.12"
633627
},
634628
{
635629
"name": "source_span",

.packages

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ process:third_party/pkg/process/lib
8282
protobuf:third_party/pkg/protobuf/protobuf/lib
8383
pub:third_party/pkg/pub/lib
8484
pub_semver:third_party/pkg/pub_semver/lib
85-
resource:third_party/pkg/resource/lib
8685
sdk_library_metadata:sdk/lib/_internal/sdk_library_metadata/lib
8786
shelf:third_party/pkg/shelf/lib
8887
shelf_packages_handler:third_party/pkg/shelf_packages_handler/lib

BUILD.gn

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,6 @@ group("dartdevc") {
100100
deps = [ "utils/dartdevc" ]
101101
}
102102

103-
group("dartfmt") {
104-
deps = [ "utils/dartfmt" ]
105-
}
106-
107103
group("analysis_server") {
108104
deps = [ "utils/analysis_server" ]
109105
}
@@ -128,8 +124,8 @@ group("compressed_observatory_archive") {
128124
}
129125

130126
if (is_fuchsia) {
131-
import("third_party/fuchsia/sdk/linux/build/component.gni")
132-
import("third_party/fuchsia/sdk/linux/build/package.gni")
127+
import("third_party/fuchsia/sdk/${host_os}/build/component.gni")
128+
import("third_party/fuchsia/sdk/${host_os}/build/package.gni")
133129

134130
template("dart_fuchsia_test_package") {
135131
fuchsia_package(target_name) {

0 commit comments

Comments
 (0)