Skip to content

Commit

Permalink
Version 2.15.0
Browse files Browse the repository at this point in the history 
Merge '2.15.0-268.18.beta' into stable
  • Loading branch information
@athomas
athomas committed Dec 3, 2021
2 parents 4ac35a7 + 52519ea commit 3d2629c
Show file tree
Hide file tree
Showing 7,643 changed files with 495,610 additions and 174,529 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
74 changes: 43 additions & 31 deletions .dart_tool/package_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"constraint, update this by running tools/generate_package_config.dart."
],
"configVersion": 2,
"generated": "2021-07-27T19:27:52.638315",
"generated": "2021-10-26T10:20:01.277340",
"generator": "tools/generate_package_config.dart",
"packages": [
{
Expand Down Expand Up @@ -70,7 +70,7 @@
"name": "analysis_server",
"rootUri": "../pkg/analysis_server",
"packageUri": "lib/",
"languageVersion": "2.12"
"languageVersion": "2.14"
},
{
"name": "analysis_server_client",
Expand All @@ -82,7 +82,7 @@
"name": "analyzer",
"rootUri": "../pkg/analyzer",
"packageUri": "lib/",
"languageVersion": "2.12"
"languageVersion": "2.14"
},
{
"name": "analyzer_cli",
Expand All @@ -94,7 +94,7 @@
"name": "analyzer_plugin",
"rootUri": "../pkg/analyzer_plugin",
"packageUri": "lib/",
"languageVersion": "2.12"
"languageVersion": "2.14"
},
{
"name": "analyzer_utilities",
Expand All @@ -112,7 +112,7 @@
"name": "async",
"rootUri": "../third_party/pkg/async",
"packageUri": "lib/",
"languageVersion": "2.12"
"languageVersion": "2.14"
},
{
"name": "async_helper",
Expand Down Expand Up @@ -150,6 +150,12 @@
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "characters",
"rootUri": "../third_party/pkg/characters",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "charcode",
"rootUri": "../third_party/pkg/charcode",
Expand Down Expand Up @@ -200,21 +206,27 @@
},
{
"name": "dart2js_info",
"rootUri": "../third_party/pkg/dart2js_info",
"rootUri": "../pkg/dart2js_info",
"packageUri": "lib/",
"languageVersion": "2.3"
"languageVersion": "2.11"
},
{
"name": "dart2js_runtime_metrics",
"rootUri": "../pkg/dart2js_runtime_metrics",
"packageUri": "lib/",
"languageVersion": "2.14"
},
{
"name": "dart2js_tools",
"rootUri": "../pkg/dart2js_tools",
"packageUri": "lib/",
"languageVersion": "2.3"
"languageVersion": "2.12"
},
{
"name": "dart2native",
"rootUri": "../pkg/dart2native",
"packageUri": "lib/",
"languageVersion": "2.7"
"languageVersion": "2.12"
},
{
"name": "dart_internal",
Expand Down Expand Up @@ -244,14 +256,20 @@
"name": "dds",
"rootUri": "../pkg/dds",
"packageUri": "lib/",
"languageVersion": "2.12"
"languageVersion": "2.13"
},
{
"name": "dev_compiler",
"rootUri": "../pkg/dev_compiler",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "devtools_server",
"rootUri": "../third_party/devtools/devtools_server",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "devtools_shared",
"rootUri": "../third_party/devtools/devtools_shared",
Expand Down Expand Up @@ -298,7 +316,7 @@
"name": "front_end",
"rootUri": "../pkg/front_end",
"packageUri": "lib/",
"languageVersion": "2.12"
"languageVersion": "2.13"
},
{
"name": "front_end_testcases",
Expand Down Expand Up @@ -333,7 +351,7 @@
"name": "http",
"rootUri": "../third_party/pkg/http",
"packageUri": "lib/",
"languageVersion": "2.12"
"languageVersion": "2.14"
},
{
"name": "http_io",
Expand All @@ -353,12 +371,6 @@
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "http_throttle",
"rootUri": "../third_party/pkg/http_throttle",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "intl",
"rootUri": "../third_party/pkg/intl",
Expand Down Expand Up @@ -458,13 +470,13 @@
"name": "native_stack_traces",
"rootUri": "../pkg/native_stack_traces",
"packageUri": "lib/",
"languageVersion": "2.12"
"languageVersion": "2.14"
},
{
"name": "nnbd_migration",
"rootUri": "../pkg/nnbd_migration",
"packageUri": "lib/",
"languageVersion": "2.12"
"languageVersion": "2.14"
},
{
"name": "oauth2",
Expand All @@ -482,7 +494,7 @@
"name": "observatory_2",
"rootUri": "../runtime/observatory_2",
"packageUri": "lib/",
"languageVersion": "2.2"
"languageVersion": "2.6"
},
{
"name": "observatory_test_package",
Expand All @@ -503,7 +515,7 @@
{
"name": "package_deps",
"rootUri": "../tools/package_deps",
"languageVersion": "2.8"
"languageVersion": "2.12"
},
{
"name": "path",
Expand Down Expand Up @@ -553,12 +565,6 @@
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "resource",
"rootUri": "../third_party/pkg/resource",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "scrape",
"rootUri": "../pkg/scrape",
Expand Down Expand Up @@ -605,7 +611,7 @@
"name": "smith",
"rootUri": "../pkg/smith",
"packageUri": "lib/",
"languageVersion": "2.3"
"languageVersion": "2.12"
},
{
"name": "source_map_stack_trace",
Expand All @@ -617,7 +623,7 @@
"name": "source_maps",
"rootUri": "../third_party/pkg/source_maps",
"packageUri": "lib/",
"languageVersion": "2.10"
"languageVersion": "2.12"
},
{
"name": "source_span",
Expand Down Expand Up @@ -647,7 +653,7 @@
"name": "status_file",
"rootUri": "../pkg/status_file",
"packageUri": "lib/",
"languageVersion": "2.3"
"languageVersion": "2.12"
},
{
"name": "stream_channel",
Expand Down Expand Up @@ -798,6 +804,12 @@
"rootUri": "../third_party/pkg/yaml",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "yaml_edit",
"rootUri": "../third_party/pkg/yaml_edit",
"packageUri": "lib/",
"languageVersion": "2.12"
}
]
}
7 changes: 3 additions & 4 deletions .packages
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ compiler:pkg/compiler/lib
convert:third_party/pkg/convert/lib
crypto:third_party/pkg/crypto/lib
csslib:third_party/pkg/csslib/lib
dart2js_info:third_party/pkg/dart2js_info/lib
dart2js_info:pkg/dart2js_info/lib
dart2js_runtime_metrics:pkg/dart2js_runtime_metrics/lib
dart2js_tools:pkg/dart2js_tools/lib
dart2native:pkg/dart2native/lib
dart_internal:pkg/dart_internal/lib
Expand All @@ -38,6 +39,7 @@ dartdev:pkg/dartdev/lib
dartdoc:third_party/pkg/dartdoc/lib
dds:pkg/dds/lib
dev_compiler:pkg/dev_compiler/lib
devtools_server:third_party/devtools/devtools_server/lib
devtools_shared:third_party/devtools/devtools_shared/lib
diagnostic:pkg/diagnostic/lib
expect:pkg/expect/lib
Expand All @@ -51,8 +53,6 @@ http:third_party/pkg/http/lib
http_io:third_party/pkg_tested/http_io/lib
http_multi_server:third_party/pkg/http_multi_server/lib
http_parser:third_party/pkg/http_parser/lib
http_retry:third_party/pkg/http_retry/lib
http_throttle:third_party/pkg/http_throttle/lib
intl:third_party/pkg/intl/lib
js:pkg/js/lib
js_ast:pkg/js_ast/lib
Expand Down Expand Up @@ -82,7 +82,6 @@ process:third_party/pkg/process/lib
protobuf:third_party/pkg/protobuf/protobuf/lib
pub:third_party/pkg/pub/lib
pub_semver:third_party/pkg/pub_semver/lib
resource:third_party/pkg/resource/lib
sdk_library_metadata:sdk/lib/_internal/sdk_library_metadata/lib
shelf:third_party/pkg/shelf/lib
shelf_packages_handler:third_party/pkg/shelf_packages_handler/lib
Expand Down
25 changes: 3 additions & 22 deletions BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ group("most") {
":dartanalyzer",
":dartdevc",
":runtime",
":samples",
]
}

Expand All @@ -42,13 +41,11 @@ group("runtime") {
}
deps = [
"runtime/bin:dart",
"runtime/bin:entrypoints_verification_test_extension",
"runtime/bin:entrypoints_verification_test",
"runtime/bin:ffi_test_dynamic_library",
"runtime/bin:ffi_test_functions",
"runtime/bin:process_test",
"runtime/bin:run_vm_tests",
"runtime/bin:sample_extension",
"runtime/bin:test_extension",
"runtime/vm:kernel_platform_files($host_toolchain)",
"utils/kernel-service:kernel-service",
]
Expand All @@ -73,14 +70,6 @@ group("run_ffi_unit_tests") {
deps = [ "runtime/bin/ffi_unit_test:run_ffi_unit_tests" ]
}

group("runtime_kernel") {
if (targetting_fuchsia) {
# Fuchsia has run_vm_tests marked testonly.
testonly = true
}
deps = [ ":runtime" ]
}

group("runtime_precompiled") {
deps = [
"runtime/bin:dart_precompiled_runtime",
Expand Down Expand Up @@ -111,10 +100,6 @@ group("dartdevc") {
deps = [ "utils/dartdevc" ]
}

group("dartfmt") {
deps = [ "utils/dartfmt" ]
}

group("analysis_server") {
deps = [ "utils/analysis_server" ]
}
Expand All @@ -126,10 +111,6 @@ group("dart2js_bot") {
deps = [ ":create_sdk" ]
}

group("samples") {
deps = [ "runtime/bin:sample_extension" ]
}

# This rule and the compressed_observatory_archive rule are for the Fuchsia
# bots that pre-build the Observatory. They copy the observatory tar files to
# the root build output directory for convenient access by the Fuchsia buildbot
Expand All @@ -143,8 +124,8 @@ group("compressed_observatory_archive") {
}

if (is_fuchsia) {
import("third_party/fuchsia/sdk/linux/build/component.gni")
import("third_party/fuchsia/sdk/linux/build/package.gni")
import("third_party/fuchsia/sdk/${host_os}/build/component.gni")
import("third_party/fuchsia/sdk/${host_os}/build/package.gni")

template("dart_fuchsia_test_package") {
fuchsia_package(target_name) {
Expand Down
Loading

0 comments on commit 3d2629c

Please sign in to comment.