diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index 70cfbb2a186..2b29fe494c9 100644 --- a/.dart_tool/package_config.json +++ b/.dart_tool/package_config.json @@ -11,7 +11,7 @@ "constraint, update this by running tools/generate_package_config.dart." ], "configVersion": 2, - "generated": "2021-01-16T20:34:15.774260", + "generated": "2021-02-04T09:42:25.936196", "generator": "tools/generate_package_config.dart", "packages": [ { @@ -94,7 +94,7 @@ "name": "analyzer_plugin", "rootUri": "../pkg/analyzer_plugin", "packageUri": "lib/", - "languageVersion": "2.3" + "languageVersion": "2.9" }, { "name": "analyzer_utilities", @@ -117,7 +117,8 @@ { "name": "async_helper", "rootUri": "../pkg/async_helper", - "packageUri": "lib/" + "packageUri": "lib/", + "languageVersion": "2.12" }, { "name": "bazel_worker", @@ -177,19 +178,19 @@ "name": "convert", "rootUri": "../third_party/pkg/convert", "packageUri": "lib/", - "languageVersion": "2.10" + "languageVersion": "2.12" }, { "name": "crypto", "rootUri": "../third_party/pkg/crypto", "packageUri": "lib/", - "languageVersion": "2.10" + "languageVersion": "2.12" }, { "name": "csslib", "rootUri": "../third_party/pkg/csslib", "packageUri": "lib/", - "languageVersion": "2.11" + "languageVersion": "2.12" }, { "name": "dart2js_info", @@ -254,7 +255,8 @@ { "name": "expect", "rootUri": "../pkg/expect", - "packageUri": "lib/" + "packageUri": "lib/", + "languageVersion": "2.12" }, { "name": "ffi", @@ -268,6 +270,12 @@ "packageUri": "lib/", "languageVersion": "2.12" }, + { + "name": "file_testing", + "rootUri": "../third_party/pkg/file/packages/file_testing", + "packageUri": "lib/", + "languageVersion": "2.1" + }, { "name": "fixnum", "rootUri": "../third_party/pkg/fixnum", @@ -307,7 +315,7 @@ "name": "http", "rootUri": "../third_party/pkg/http", "packageUri": "lib/", - "languageVersion": "2.10" + "languageVersion": "2.12" }, { "name": "http_io", @@ -349,7 +357,7 @@ "name": "js", "rootUri": "../pkg/js", "packageUri": "lib/", - "languageVersion": "2.10" + "languageVersion": "2.12" }, { "name": "js_ast", @@ -390,7 +398,7 @@ "name": "logging", "rootUri": "../third_party/pkg/logging", "packageUri": "lib/", - "languageVersion": "2.10" + "languageVersion": "2.12" }, { "name": "markdown", @@ -408,7 +416,7 @@ "name": "meta", "rootUri": "../pkg/meta", "packageUri": "lib/", - "languageVersion": "2.10" + "languageVersion": "2.12" }, { "name": "mime", @@ -456,7 +464,7 @@ "name": "observatory", "rootUri": "../runtime/observatory", "packageUri": "lib/", - "languageVersion": "2.10" + "languageVersion": "2.12" }, { "name": "observatory_2", @@ -495,13 +503,13 @@ "name": "pedantic", "rootUri": "../third_party/pkg/pedantic", "packageUri": "lib/", - "languageVersion": "2.10" + "languageVersion": "2.12" }, { "name": "pool", "rootUri": "../third_party/pkg/pool", "packageUri": "lib/", - "languageVersion": "2.10" + "languageVersion": "2.12" }, { "name": "protobuf", @@ -536,7 +544,8 @@ { "name": "sdk_library_metadata", "rootUri": "../sdk/lib/_internal/sdk_library_metadata", - "packageUri": "lib/" + "packageUri": "lib/", + "languageVersion": "2.12" }, { "name": "shelf", @@ -560,7 +569,7 @@ "name": "shelf_static", "rootUri": "../third_party/pkg/shelf_static", "packageUri": "lib/", - "languageVersion": "2.0" + "languageVersion": "2.3" }, { "name": "shelf_web_socket", @@ -590,7 +599,7 @@ "name": "source_span", "rootUri": "../third_party/pkg/source_span", "packageUri": "lib/", - "languageVersion": "2.10" + "languageVersion": "2.12" }, { "name": "sourcemap_testing", @@ -608,13 +617,13 @@ "name": "stack_trace", "rootUri": "../third_party/pkg/stack_trace", "packageUri": "lib/", - "languageVersion": "2.10" + "languageVersion": "2.12" }, { "name": "stagehand", "rootUri": "../third_party/pkg/stagehand", "packageUri": "lib/", - "languageVersion": "2.8" + "languageVersion": "2.10" }, { "name": "status_file", @@ -758,7 +767,7 @@ "name": "web_socket_channel", "rootUri": "../third_party/pkg/web_socket_channel", "packageUri": "lib/", - "languageVersion": "2.0" + "languageVersion": "2.10" }, { "name": "webdriver", @@ -773,4 +782,4 @@ "languageVersion": "2.12" } ] -} +} \ No newline at end of file diff --git a/DEPS b/DEPS index d1a47ccf8a1..9167b6a5fb1 100644 --- a/DEPS +++ b/DEPS @@ -71,7 +71,7 @@ vars = { "args_rev": "2c6a221f45e4e0ef447b5d09101bf8a52e1ccd36", "async_rev": "695b3ac280f107c84adf7488743abfdfaaeea68f", "bazel_worker_rev": "060c55a933d39798681a4f533b161b81dc48d77e", - "benchmark_harness_rev": "ec6b646f5443faa871e126ac1ba248c94ca06257", + "benchmark_harness_rev": "c546dbd9f639f75cd2f75de8df2eb9f8ea15e8e7", "boolean_selector_rev": "665e6921ab246569420376f827bff4585dff0b14", "boringssl_gen_rev": "aaac86738c4f2d1bdf00f54d197f50f247ffee04", "boringssl_rev" : "4dfd5af70191b068aebe567b8e29ce108cee85ce", diff --git a/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart b/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart index 8e3687f2c5a..030cecb0ff9 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.12.0'; +const _currentVersion = '2.13.0'; /// A map containing information about all known experimental flags. final _knownFeatures = { diff --git a/pkg/analyzer_utilities/pubspec.yaml b/pkg/analyzer_utilities/pubspec.yaml index 714215717c4..a8426e4463a 100644 --- a/pkg/analyzer_utilities/pubspec.yaml +++ b/pkg/analyzer_utilities/pubspec.yaml @@ -3,7 +3,7 @@ name: analyzer_utilities publish_to: none environment: - sdk: '>=2.1.0 <3.0.0' + sdk: '>=2.12.0 <3.0.0' dependencies: analyzer: diff --git a/pkg/async_helper/pubspec.yaml b/pkg/async_helper/pubspec.yaml index 202f86bb351..f79d98ffea8 100644 --- a/pkg/async_helper/pubspec.yaml +++ b/pkg/async_helper/pubspec.yaml @@ -10,7 +10,7 @@ description: >- the facilities provided in package:test. environment: - sdk: '>=2.0.0' + sdk: '>=2.12.0 <3.0.0' dependencies: expect: diff --git a/pkg/expect/pubspec.yaml b/pkg/expect/pubspec.yaml index 6a8f0bcc7f2..f84f8c96eda 100644 --- a/pkg/expect/pubspec.yaml +++ b/pkg/expect/pubspec.yaml @@ -9,7 +9,7 @@ description: >- test assertions. environment: - sdk: '>=2.0.0' + sdk: '>=2.12.0 <3.0.0' dependencies: meta: 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 f2f282f904c..19157871602 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 @@ -27,18 +27,18 @@ enum ExperimentalFlag { } const Version enableAlternativeInvalidationStrategyVersion = - const Version(2, 12); + const Version(2, 13); const Version enableConstantUpdate2018Version = const Version(2, 0); const Version enableControlFlowCollectionsVersion = const Version(2, 0); const Version enableExtensionMethodsVersion = const Version(2, 6); -const Version enableGenericMetadataVersion = const Version(2, 12); +const Version enableGenericMetadataVersion = const Version(2, 13); const Version enableNonNullableVersion = const Version(2, 12); -const Version enableNonfunctionTypeAliasesVersion = const Version(2, 12); +const Version enableNonfunctionTypeAliasesVersion = const Version(2, 13); const Version enableSetLiteralsVersion = const Version(2, 0); const Version enableSpreadCollectionsVersion = const Version(2, 0); -const Version enableTripleShiftVersion = const Version(2, 12); -const Version enableValueClassVersion = const Version(2, 12); -const Version enableVarianceVersion = const Version(2, 12); +const Version enableTripleShiftVersion = const Version(2, 13); +const Version enableValueClassVersion = const Version(2, 13); +const Version enableVarianceVersion = const Version(2, 13); ExperimentalFlag parseExperimentalFlag(String flag) { switch (flag) { @@ -101,33 +101,33 @@ const Map expiredExperimentalFlags = { }; const Map experimentEnabledVersion = { - ExperimentalFlag.alternativeInvalidationStrategy: const Version(2, 12), + ExperimentalFlag.alternativeInvalidationStrategy: const Version(2, 13), ExperimentalFlag.constantUpdate2018: const Version(2, 0), ExperimentalFlag.controlFlowCollections: const Version(2, 0), ExperimentalFlag.extensionMethods: const Version(2, 6), - ExperimentalFlag.genericMetadata: const Version(2, 12), + ExperimentalFlag.genericMetadata: const Version(2, 13), ExperimentalFlag.nonNullable: const Version(2, 12), - ExperimentalFlag.nonfunctionTypeAliases: const Version(2, 12), + ExperimentalFlag.nonfunctionTypeAliases: const Version(2, 13), ExperimentalFlag.setLiterals: const Version(2, 0), ExperimentalFlag.spreadCollections: const Version(2, 0), - ExperimentalFlag.tripleShift: const Version(2, 12), - ExperimentalFlag.valueClass: const Version(2, 12), - ExperimentalFlag.variance: const Version(2, 12), + ExperimentalFlag.tripleShift: const Version(2, 13), + ExperimentalFlag.valueClass: const Version(2, 13), + ExperimentalFlag.variance: const Version(2, 13), }; const Map experimentReleasedVersion = { - ExperimentalFlag.alternativeInvalidationStrategy: const Version(2, 12), + ExperimentalFlag.alternativeInvalidationStrategy: const Version(2, 13), ExperimentalFlag.constantUpdate2018: const Version(2, 0), ExperimentalFlag.controlFlowCollections: const Version(2, 0), ExperimentalFlag.extensionMethods: const Version(2, 6), - ExperimentalFlag.genericMetadata: const Version(2, 12), + ExperimentalFlag.genericMetadata: const Version(2, 13), ExperimentalFlag.nonNullable: const Version(2, 10), - ExperimentalFlag.nonfunctionTypeAliases: const Version(2, 12), + ExperimentalFlag.nonfunctionTypeAliases: const Version(2, 13), ExperimentalFlag.setLiterals: const Version(2, 0), ExperimentalFlag.spreadCollections: const Version(2, 0), - ExperimentalFlag.tripleShift: const Version(2, 12), - ExperimentalFlag.valueClass: const Version(2, 12), - ExperimentalFlag.variance: const Version(2, 12), + ExperimentalFlag.tripleShift: const Version(2, 13), + ExperimentalFlag.valueClass: const Version(2, 13), + ExperimentalFlag.variance: const Version(2, 13), }; const AllowedExperimentalFlags defaultAllowedExperimentalFlags = diff --git a/pkg/kernel/lib/default_language_version.dart b/pkg/kernel/lib/default_language_version.dart index 8dbbe5b1522..5b39ec46774 100644 --- a/pkg/kernel/lib/default_language_version.dart +++ b/pkg/kernel/lib/default_language_version.dart @@ -11,4 +11,4 @@ import "ast.dart"; -Version defaultLanguageVersion = const Version(2, 12); +Version defaultLanguageVersion = const Version(2, 13); diff --git a/runtime/vm/experimental_features.cc b/runtime/vm/experimental_features.cc index 1fffd1a1c55..fd0fe597070 100644 --- a/runtime/vm/experimental_features.cc +++ b/runtime/vm/experimental_features.cc @@ -6,7 +6,7 @@ // Instead modify 'tools/experimental_features.yaml' and run // 'dart tools/generate_experimental_flags.dart' to update. // -// Current version: 2.12.0 +// Current version: 2.13.0 #include "vm/experimental_features.h" diff --git a/runtime/vm/experimental_features.h b/runtime/vm/experimental_features.h index 797b0d24961..8efd29ec704 100644 --- a/runtime/vm/experimental_features.h +++ b/runtime/vm/experimental_features.h @@ -6,7 +6,7 @@ // Instead modify 'tools/experimental_features.yaml' and run // 'dart tools/generate_experimental_flags.dart' to update. // -// Current version: 2.12.0 +// Current version: 2.13.0 #ifndef RUNTIME_VM_EXPERIMENTAL_FEATURES_H_ #define RUNTIME_VM_EXPERIMENTAL_FEATURES_H_ diff --git a/sdk/lib/_internal/sdk_library_metadata/pubspec.yaml b/sdk/lib/_internal/sdk_library_metadata/pubspec.yaml index 7f66713b36e..5624a4e3443 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.11.0 <3.0.0' + sdk: '>=2.12.0 <3.0.0' diff --git a/tools/VERSION b/tools/VERSION index 10b75b8c5ed..5a5bd469432 100644 --- a/tools/VERSION +++ b/tools/VERSION @@ -25,7 +25,7 @@ # CHANNEL be MAJOR 2 -MINOR 12 +MINOR 13 PATCH 0 PRERELEASE 0 PRERELEASE_PATCH 0 diff --git a/tools/experimental_features.yaml b/tools/experimental_features.yaml index 823773d05dc..bd85a2b6c2a 100644 --- a/tools/experimental_features.yaml +++ b/tools/experimental_features.yaml @@ -97,7 +97,7 @@ # default 'language' "category" with code generated for both CFE and Analyzer, # while other categories can be tailored more specifically. -current-version: '2.12.0' +current-version: '2.13.0' features: triple-shift: diff --git a/tools/generate_package_config.dart b/tools/generate_package_config.dart index 08b79205d6e..516dcf7ddfb 100644 --- a/tools/generate_package_config.dart +++ b/tools/generate_package_config.dart @@ -19,6 +19,7 @@ void main(List args) { ...listSubdirectories('pkg'), ...listSubdirectories('third_party/pkg'), ...listSubdirectories('third_party/pkg_tested'), + ...listSubdirectories('third_party/pkg/file/packages'), ...listSubdirectories('third_party/pkg/test/pkgs'), packageDirectory('runtime/observatory'), packageDirectory( @@ -27,7 +28,6 @@ void main(List args) { packageDirectory( 'runtime/observatory_2/tests/service_2/observatory_test_package_2'), packageDirectory('sdk/lib/_internal/sdk_library_metadata'), - packageDirectory('sdk/lib/_internal/js_runtime'), packageDirectory('third_party/pkg/protobuf/protobuf'), packageDirectory('tools/package_deps'), ];