From f88ce7aef5f8a41fddfab8e26f8b2c6e0e950236 Mon Sep 17 00:00:00 2001 From: William Hesse Date: Wed, 22 Jul 2020 13:22:07 +0000 Subject: [PATCH] Increase Dart version to 2.10 Change-Id: Ic6b556f935602834564aca24690608aa624efa43 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/155440 Reviewed-by: Martin Kustermann --- .dart_tool/package_config.json | 52 +++++++++---------- DEPS | 46 ++++++++-------- .../lib/src/dart/analysis/experiments.g.dart | 2 +- .../experimental_flags_generated.dart | 10 ++-- pkg/js/pubspec.yaml | 2 +- pkg/kernel/lib/default_language_version.dart | 2 +- pkg/meta/pubspec.yaml | 2 +- sdk/lib/_internal/js_runtime/pubspec.yaml | 2 +- .../sdk_library_metadata/pubspec.yaml | 2 +- tools/VERSION | 2 +- tools/experimental_features.yaml | 2 +- 11 files changed, 62 insertions(+), 62 deletions(-) diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index 953751e6417..6cfa6abd7ad 100644 --- a/.dart_tool/package_config.json +++ b/.dart_tool/package_config.json @@ -72,7 +72,7 @@ "name": "async", "rootUri": "../third_party/pkg/async", "packageUri": "lib/", - "languageVersion": "2.9" + "languageVersion": "2.10" }, { "name": "async_helper", @@ -89,13 +89,13 @@ "name": "benchmark_harness", "rootUri": "../third_party/pkg/benchmark_harness", "packageUri": "lib/", - "languageVersion": "2.9" + "languageVersion": "2.10" }, { "name": "boolean_selector", "rootUri": "../third_party/pkg/boolean_selector", "packageUri": "lib/", - "languageVersion": "2.4" + "languageVersion": "2.10" }, { "name": "build_integration", @@ -107,7 +107,7 @@ "name": "charcode", "rootUri": "../third_party/pkg/charcode", "packageUri": "lib/", - "languageVersion": "2.9" + "languageVersion": "2.10" }, { "name": "cli_util", @@ -119,7 +119,7 @@ "name": "collection", "rootUri": "../third_party/pkg/collection", "packageUri": "lib/", - "languageVersion": "2.9" + "languageVersion": "2.10" }, { "name": "compiler", @@ -225,7 +225,7 @@ "name": "fixnum", "rootUri": "../third_party/pkg/fixnum", "packageUri": "lib/", - "languageVersion": "2.9" + "languageVersion": "2.10" }, { "name": "front_end", @@ -327,7 +327,7 @@ "name": "js", "rootUri": "../pkg/js", "packageUri": "lib/", - "languageVersion": "2.9" + "languageVersion": "2.10" }, { "name": "js_ast", @@ -339,7 +339,7 @@ "name": "js_runtime", "rootUri": "../sdk/lib/_internal/js_runtime", "packageUri": "lib/", - "languageVersion": "2.9" + "languageVersion": "2.10" }, { "name": "json_rpc_2", @@ -375,13 +375,13 @@ "name": "matcher", "rootUri": "../third_party/pkg/matcher", "packageUri": "lib/", - "languageVersion": "2.7" + "languageVersion": "2.10" }, { "name": "meta", "rootUri": "../pkg/meta", "packageUri": "lib/", - "languageVersion": "2.9" + "languageVersion": "2.10" }, { "name": "mime", @@ -446,19 +446,19 @@ "name": "path", "rootUri": "../third_party/pkg/path", "packageUri": "lib/", - "languageVersion": "2.0" + "languageVersion": "2.10" }, { "name": "pedantic", "rootUri": "../third_party/pkg/pedantic", "packageUri": "lib/", - "languageVersion": "2.1" + "languageVersion": "2.10" }, { "name": "pool", "rootUri": "../third_party/pkg/pool", "packageUri": "lib/", - "languageVersion": "2.0" + "languageVersion": "2.10" }, { "name": "protobuf", @@ -494,7 +494,7 @@ "name": "sdk_library_metadata", "rootUri": "../sdk/lib/_internal/sdk_library_metadata", "packageUri": "lib/", - "languageVersion": "2.9" + "languageVersion": "2.10" }, { "name": "shelf", @@ -536,19 +536,19 @@ "name": "source_map_stack_trace", "rootUri": "../third_party/pkg/source_map_stack_trace", "packageUri": "lib/", - "languageVersion": "2.7" + "languageVersion": "2.10" }, { "name": "source_maps", "rootUri": "../third_party/pkg/source_maps", "packageUri": "lib/", - "languageVersion": "2.0" + "languageVersion": "2.10" }, { "name": "source_span", "rootUri": "../third_party/pkg/source_span", "packageUri": "lib/", - "languageVersion": "2.6" + "languageVersion": "2.10" }, { "name": "sourcemap_testing", @@ -566,7 +566,7 @@ "name": "stack_trace", "rootUri": "../third_party/pkg/stack_trace", "packageUri": "lib/", - "languageVersion": "2.0" + "languageVersion": "2.10" }, { "name": "stagehand", @@ -584,13 +584,13 @@ "name": "stream_channel", "rootUri": "../third_party/pkg/stream_channel", "packageUri": "lib/", - "languageVersion": "2.2" + "languageVersion": "2.10" }, { "name": "string_scanner", "rootUri": "../third_party/pkg/string_scanner", "packageUri": "lib/", - "languageVersion": "2.0" + "languageVersion": "2.10" }, { "name": "sync_http", @@ -608,25 +608,25 @@ "name": "term_glyph", "rootUri": "../third_party/pkg/term_glyph", "packageUri": "lib/", - "languageVersion": "1.8" + "languageVersion": "2.10" }, { "name": "test", "rootUri": "../third_party/pkg/test/pkgs/test", "packageUri": "lib/", - "languageVersion": "2.7" + "languageVersion": "2.10" }, { "name": "test_api", "rootUri": "../third_party/pkg/test/pkgs/test_api", "packageUri": "lib/", - "languageVersion": "2.7" + "languageVersion": "2.10" }, { "name": "test_core", "rootUri": "../third_party/pkg/test/pkgs/test_core", "packageUri": "lib/", - "languageVersion": "2.7" + "languageVersion": "2.10" }, { "name": "test_descriptor", @@ -668,7 +668,7 @@ "name": "typed_data", "rootUri": "../third_party/pkg/typed_data", "packageUri": "lib/", - "languageVersion": "2.9" + "languageVersion": "2.10" }, { "name": "usage", @@ -680,7 +680,7 @@ "name": "vector_math", "rootUri": "../third_party/pkg/vector_math", "packageUri": "lib/", - "languageVersion": "2.9" + "languageVersion": "2.10" }, { "name": "vm", diff --git a/DEPS b/DEPS index 8986822dee5..5048e73f38a 100644 --- a/DEPS +++ b/DEPS @@ -39,7 +39,7 @@ vars = { # Checked-in SDK version. The checked-in SDK is a Dart SDK distribution in a # cipd package used to run Dart scripts in the build and test infrastructure. - "sdk_tag": "version:2.9.0-21.0.dev", + "sdk_tag": "version:2.10.0-0.2-preview", # co19 is a cipd package. Use update.sh in tests/co19[_2] to update these # hashes. It requires access to the dart-build-access group, which EngProd @@ -66,17 +66,17 @@ vars = { # Revisions of /third_party/* dependencies. "args_tag": "1.6.0", - "async_rev": "6b90f4557f330e1ead021f501ee7f1d8b0e77815", + "async_rev": "128c461a97dbdbd9336ba000ba5a5c02e79b8651", "bazel_worker_rev": "26680d5e249b249c7216ab2fed0ac8ed4ee285c5", - "benchmark_harness_rev": "a9d5fe44b1cb5527101fb4597b38b3c8b7c04ea8", - "boolean_selector_rev": "1309eabed510cc3b7536fd4367d39b97ebee3d69", + "benchmark_harness_rev": "ec6b646f5443faa871e126ac1ba248c94ca06257", + "boolean_selector_rev": "665e6921ab246569420376f827bff4585dff0b14", "boringssl_gen_rev": "429ccb1877f7987a6f3988228bc2440e61293499", "boringssl_rev" : "4dfd5af70191b068aebe567b8e29ce108cee85ce", "browser-compat-data_tag": "v1.0.22", "charcode_rev": "af1e2d59a9c383da94f99ea51dac4b93fb0626c4", "chrome_rev" : "19997", "cli_util_tag" : "0.1.4", - "collection_rev": "80f5b6de8a8d8d584732a71bb59912da3e44883b", + "collection_rev": "583693680fc067e34ca5b72503df25e8b80579f9", "convert_rev": "49bde5b371eb5c2c8e721557cf762f17c75e49fc", "crypto_rev": "7422fb2f6584fe1839eb30bc4ca56e9f9760b801", "csslib_rev": "bf372d4fdc6dfa232ad93f77a0a3de0891edd04c", @@ -99,7 +99,7 @@ vars = { "chromedriver_tag": "83.0.4103.39", "dartdoc_tag" : "v0.32.2", "ffi_rev": "454ab0f9ea6bd06942a983238d8a6818b1357edb", - "fixnum_rev": "9b38f49f6679654d66a363e69e48173cca07e882", + "fixnum_rev": "300c3f025e94a72b7b6770e15f76a4de15f77668", "glob_rev": "e9f4e6b7ae8abe5071461cf8f47191bb19cf7ef6", "html_rev": "083a36cd801a4b787ba156b7c6e4c8b2e2daed4a", "http_io_rev": "2fa188caf7937e313026557713f7feffedd4978b", @@ -117,16 +117,16 @@ vars = { "logging_rev": "9561ba016ae607747ae69b846c0e10958ca58ed4", "markupsafe_rev": "8f45f5cfa0009d2a70589bcda0349b8cb2b72783", "markdown_rev": "dd150bb64c5f3b41d31f20f399ae2a855f7f8c00", - "matcher_rev": "8f8d965933c94a489b1a39e20d558a32841bfa5b", + "matcher_rev": "9cae8faa7868bf3a88a7ba45eb0bd128e66ac515", "mime_rev": "179b5e6a88f4b63f36dc1b8fcbc1e83e5e0cd3a7", "mockito_rev": "d39ac507483b9891165e422ec98d9fb480037c8b", "mustache_rev": "664737ecad027e6b96d0d1e627257efa0e46fcb1", "oauth2_tag": "1.6.0", "package_config_rev": "9c586d04bd26fef01215fd10e7ab96a3050cfa64", - "path_rev": "4f3bb71843fe5493ba490828a1721821d7b33746", - "pedantic_tag": "v1.9.0", + "path_rev": "62ecd5a78ffe5734d14ed0df76d20309084cd04a", + "pedantic_rev": "24b38df72430d7e21cb4257828580becb9a39c72", "ply_rev": "604b32590ffad5cbb82e4afef1d305512d06ae93", - "pool_rev": "86fbb2cde9bbc66c8d159909d2f65a5981ea5b50", + "pool_rev": "eedbd5fde84f9a1a8da643b475305a81841da599", "protobuf_rev": "3746c8fd3f2b0147623a8e3db89c3ff4330de760", "pub_rev": "04b054b62cc437cf23451785fdc50e49cd9de139", "pub_semver_tag": "v1.4.4", @@ -139,25 +139,25 @@ vars = { "shelf_proxy_tag": "0.1.0+7", "shelf_tag": "0.7.3+3", "shelf_web_socket_tag": "0.2.2+3", - "source_map_stack_trace_tag": "2.0.0", + "source_map_stack_trace_rev": "1c3026f69d9771acf2f8c176a1ab750463309cce", "source_maps-0.9.4_rev": "38524", - "source_maps_rev": "87b4fd9027378bbd51b02e9d7df794eee8a82b7a", - "source_span_tag": "1.7.0", + "source_maps_rev": "53eb92ccfe6e64924054f83038a534b959b12b3e", + "source_span_rev": "94833d6cbf4552ebe5d2aa6714acecd93834e53a", "sse_tag": "e5cf68975e8e87171a3dc297577aa073454a91dc", - "stack_trace_tag": "56811dbb2530d823b764fe167ec335879a4adb32", + "stack_trace_tag": "d3813ca0a77348e0faf0d6af0cc17913e36afa39", "stagehand_tag": "v3.3.9", - "stream_channel_tag": "70433d577be02c48cb16d72d65654f3b4d82c6ed", - "string_scanner_rev": "a918e7371af6b6e73bfd534ff9da6084741c1f99", + "stream_channel_tag": "c446774fd077c9bdbd6235a7aadc661ef60a9727", + "string_scanner_rev": "1b63e6e5db5933d7be0a45da6e1129fe00262734", "sync_http_rev": "a85d7ec764ea485cbbc49f3f3e7f1b43f87a1c74", "test_descriptor_tag": "1.1.1", "test_process_tag": "1.0.3", - "term_glyph_rev": "b3da31e9684a99cfe5f192b89914492018b44da7", + "term_glyph_rev": "6a0f9b6fb645ba75e7a00a4e20072678327a0347", "test_reflective_loader_tag": "0.1.9", - "test_rev": "718fe6f93c4655208460f28e89d887c5ef4144c5", + "test_rev": "c6b3fe63eda87da1687580071cad1eefd575f851", "tflite_native_rev": "3c777c40608a2a9f1427bfe0028ab48e7116b4c1", - "typed_data_tag": "0c369b73a9b7ebf042c06512951bfe5b52b84a5f", + "typed_data_tag": "f94fc57b8e8c0e4fe4ff6cfd8290b94af52d3719", "usage_tag": "3.4.0", - "vector_math_rev": "90631fbb609f61d42f28621253c0ec9fc6a326d2", + "vector_math_rev": "0c9f5d68c047813a6dcdeb88ba7a42daddf25025", "watcher_rev": "fc3c9aae5d31d707b3013b42634dde8d8a1161b4", "webdriver_rev": "5a8d6805d9cf8a3cbb4fcd64849b538b7491e50e", "web_components_rev": "8f57dac273412a7172c8ade6f361b407e2e4ed02", @@ -378,7 +378,7 @@ deps = { Var("dart_root") + "/third_party/pkg/path": Var("dart_git") + "path.git" + "@" + Var("path_rev"), Var("dart_root") + "/third_party/pkg/pedantic": - Var("dart_git") + "pedantic.git" + "@" + Var("pedantic_tag"), + Var("dart_git") + "pedantic.git" + "@" + Var("pedantic_rev"), Var("dart_root") + "/third_party/pkg/pool": Var("dart_git") + "pool.git" + "@" + Var("pool_rev"), Var("dart_root") + "/third_party/pkg/protobuf": @@ -408,10 +408,10 @@ deps = { Var("dart_root") + "/third_party/pkg/source_maps": Var("dart_git") + "source_maps.git" + "@" + Var("source_maps_rev"), Var("dart_root") + "/third_party/pkg/source_span": - Var("dart_git") + "source_span.git" + "@" + Var("source_span_tag"), + Var("dart_git") + "source_span.git" + "@" + Var("source_span_rev"), Var("dart_root") + "/third_party/pkg/source_map_stack_trace": Var("dart_git") + "source_map_stack_trace.git" + - "@" + Var("source_map_stack_trace_tag"), + "@" + Var("source_map_stack_trace_rev"), Var("dart_root") + "/third_party/pkg/sse": Var("dart_git") + "sse.git" + "@" + Var("sse_tag"), Var("dart_root") + "/third_party/pkg/stack_trace": diff --git a/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart b/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart index 134d6b88c85..085bacbb5df 100644 --- a/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart +++ b/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart @@ -8,7 +8,7 @@ part of 'experiments.dart'; /// The current version of the Dart language (or, for non-stable releases, the /// version of the language currently in the process of being developed). -const _currentVersion = '2.9.0'; +const _currentVersion = '2.10.0'; /// A map containing information about all known experimental flags. const _knownFeatures = { diff --git a/pkg/front_end/lib/src/api_prototype/experimental_flags_generated.dart b/pkg/front_end/lib/src/api_prototype/experimental_flags_generated.dart index 26c702ac4bd..bc825bcf824 100644 --- a/pkg/front_end/lib/src/api_prototype/experimental_flags_generated.dart +++ b/pkg/front_end/lib/src/api_prototype/experimental_flags_generated.dart @@ -23,16 +23,16 @@ enum ExperimentalFlag { } const Version enableAlternativeInvalidationStrategyVersion = - const Version(2, 9); + const Version(2, 10); const Version enableConstantUpdate2018Version = const Version(2, 4); const Version enableControlFlowCollectionsVersion = const Version(2, 2); const Version enableExtensionMethodsVersion = const Version(2, 6); -const Version enableNonNullableVersion = const Version(2, 9); -const Version enableNonfunctionTypeAliasesVersion = const Version(2, 9); +const Version enableNonNullableVersion = const Version(2, 10); +const Version enableNonfunctionTypeAliasesVersion = const Version(2, 10); const Version enableSetLiteralsVersion = const Version(2, 2); const Version enableSpreadCollectionsVersion = const Version(2, 2); -const Version enableTripleShiftVersion = const Version(2, 9); -const Version enableVarianceVersion = const Version(2, 9); +const Version enableTripleShiftVersion = const Version(2, 10); +const Version enableVarianceVersion = const Version(2, 10); ExperimentalFlag parseExperimentalFlag(String flag) { switch (flag) { diff --git a/pkg/js/pubspec.yaml b/pkg/js/pubspec.yaml index ddc5195d970..721c898e00e 100644 --- a/pkg/js/pubspec.yaml +++ b/pkg/js/pubspec.yaml @@ -4,7 +4,7 @@ description: Annotations to create static Dart interfaces for JavaScript APIs. homepage: https://github.com/dart-lang/sdk/tree/master/pkg/js environment: - sdk: '>=2.9.0-18.0 <2.9.0' + sdk: '>=2.10.0-0.0 <2.10.0' dev_dependencies: pedantic: ^1.9.0 diff --git a/pkg/kernel/lib/default_language_version.dart b/pkg/kernel/lib/default_language_version.dart index cd5308ed9af..6b7b18c9d36 100644 --- a/pkg/kernel/lib/default_language_version.dart +++ b/pkg/kernel/lib/default_language_version.dart @@ -9,4 +9,4 @@ import "ast.dart"; -Version defaultLanguageVersion = const Version(2, 9); +Version defaultLanguageVersion = const Version(2, 10); diff --git a/pkg/meta/pubspec.yaml b/pkg/meta/pubspec.yaml index 20cc0bf4da7..2959f9702d3 100644 --- a/pkg/meta/pubspec.yaml +++ b/pkg/meta/pubspec.yaml @@ -8,4 +8,4 @@ description: > to provide a better user experience. environment: # This must remain a tight constraint until nnbd is stable. - sdk: '>=2.9.0-18.0 <=2.9.10' + sdk: '>=2.10.0-0.0 <2.10.0' diff --git a/sdk/lib/_internal/js_runtime/pubspec.yaml b/sdk/lib/_internal/js_runtime/pubspec.yaml index 75ee57a58c2..96abf65bcbe 100644 --- a/sdk/lib/_internal/js_runtime/pubspec.yaml +++ b/sdk/lib/_internal/js_runtime/pubspec.yaml @@ -3,4 +3,4 @@ name: js_runtime publish_to: none environment: - sdk: '>=2.9.0-1 <3.0.0' + sdk: '>=2.10.0-0.0 <3.0.0' diff --git a/sdk/lib/_internal/sdk_library_metadata/pubspec.yaml b/sdk/lib/_internal/sdk_library_metadata/pubspec.yaml index 717980548e8..8f46e5323ce 100644 --- a/sdk/lib/_internal/sdk_library_metadata/pubspec.yaml +++ b/sdk/lib/_internal/sdk_library_metadata/pubspec.yaml @@ -3,4 +3,4 @@ name: sdk_library_metadata publish_to: none environment: - sdk: '>=2.9.0-1 <3.0.0' + sdk: '>=2.10.0-0.0 <3.0.0' diff --git a/tools/VERSION b/tools/VERSION index 332045f12ef..346e376cb30 100644 --- a/tools/VERSION +++ b/tools/VERSION @@ -31,7 +31,7 @@ # CHANNEL be MAJOR 2 -MINOR 9 +MINOR 10 PATCH 0 PRERELEASE 0 PRERELEASE_PATCH 0 diff --git a/tools/experimental_features.yaml b/tools/experimental_features.yaml index a680662ea0f..7a9a03f061e 100644 --- a/tools/experimental_features.yaml +++ b/tools/experimental_features.yaml @@ -85,7 +85,7 @@ # default 'language' "category" with code generated for both CFE and Analyzer, # while other categories can be tailored more specifically. -current-version: 2.9 +current-version: '2.10.0' features: non-nullable: