diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index 18686f861fa..12e1c33014c 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": "2020-09-18T09:56:27.880444", + "generated": "2020-08-18T15:38:52.410101", "generator": "tools/generate_package_config.dart", "packages": [ { @@ -184,7 +184,7 @@ "name": "dart2js_info", "rootUri": "../third_party/pkg/dart2js_info", "packageUri": "lib/", - "languageVersion": "2.3" + "languageVersion": "2.0" }, { "name": "dart2js_tools", @@ -207,7 +207,8 @@ { "name": "dart_style", "rootUri": "../third_party/pkg_tested/dart_style", - "packageUri": "lib/" + "packageUri": "lib/", + "languageVersion": "2.7" }, { "name": "dartdev", @@ -347,7 +348,8 @@ { "name": "js_runtime", "rootUri": "../sdk/lib/_internal/js_runtime", - "packageUri": "lib/" + "packageUri": "lib/", + "languageVersion": "2.10" }, { "name": "json_rpc_2", @@ -482,7 +484,8 @@ { "name": "pub", "rootUri": "../third_party/pkg/pub", - "packageUri": "lib/" + "packageUri": "lib/", + "languageVersion": "2.3" }, { "name": "pub_semver", @@ -505,7 +508,8 @@ { "name": "sdk_library_metadata", "rootUri": "../sdk/lib/_internal/sdk_library_metadata", - "packageUri": "lib/" + "packageUri": "lib/", + "languageVersion": "2.10" }, { "name": "shelf", @@ -748,4 +752,4 @@ "languageVersion": "2.4" } ] -} \ No newline at end of file +} diff --git a/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart b/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart index 9f390a8e8fa..74f160b3194 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.11.0'; +const _currentVersion = '2.10.0'; /// A map containing information about all known experimental flags. final _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 c6aff819137..80a1d09569e 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 @@ -24,17 +24,17 @@ enum ExperimentalFlag { } const Version enableAlternativeInvalidationStrategyVersion = - const Version(2, 11); + const Version(2, 10); const Version enableConstantUpdate2018Version = const Version(2, 0); const Version enableControlFlowCollectionsVersion = const Version(2, 0); const Version enableExtensionMethodsVersion = const Version(2, 6); -const Version enableNonNullableVersion = const Version(2, 11); -const Version enableNonfunctionTypeAliasesVersion = const Version(2, 11); +const Version enableNonNullableVersion = const Version(2, 10); +const Version enableNonfunctionTypeAliasesVersion = const Version(2, 10); const Version enableSetLiteralsVersion = const Version(2, 0); const Version enableSpreadCollectionsVersion = const Version(2, 0); -const Version enableTripleShiftVersion = const Version(2, 11); -const Version enableValueClassVersion = const Version(2, 11); -const Version enableVarianceVersion = const Version(2, 11); +const Version enableTripleShiftVersion = const Version(2, 10); +const Version enableValueClassVersion = const Version(2, 10); +const Version enableVarianceVersion = const Version(2, 10); ExperimentalFlag parseExperimentalFlag(String flag) { switch (flag) { @@ -93,31 +93,31 @@ const Map expiredExperimentalFlags = { }; const Map experimentEnabledVersion = { - ExperimentalFlag.alternativeInvalidationStrategy: const Version(2, 11), - ExperimentalFlag.constantUpdate2018: const Version(2, 0), - ExperimentalFlag.controlFlowCollections: const Version(2, 0), - ExperimentalFlag.extensionMethods: const Version(2, 6), - ExperimentalFlag.nonNullable: const Version(2, 11), - ExperimentalFlag.nonfunctionTypeAliases: const Version(2, 11), - ExperimentalFlag.setLiterals: const Version(2, 0), - ExperimentalFlag.spreadCollections: const Version(2, 0), - ExperimentalFlag.tripleShift: const Version(2, 11), - ExperimentalFlag.valueClass: const Version(2, 11), - ExperimentalFlag.variance: const Version(2, 11), -}; - -const Map experimentReleasedVersion = { - ExperimentalFlag.alternativeInvalidationStrategy: const Version(2, 11), + ExperimentalFlag.alternativeInvalidationStrategy: const Version(2, 10), ExperimentalFlag.constantUpdate2018: const Version(2, 0), ExperimentalFlag.controlFlowCollections: const Version(2, 0), ExperimentalFlag.extensionMethods: const Version(2, 6), ExperimentalFlag.nonNullable: const Version(2, 10), - ExperimentalFlag.nonfunctionTypeAliases: const Version(2, 11), + ExperimentalFlag.nonfunctionTypeAliases: const Version(2, 10), ExperimentalFlag.setLiterals: const Version(2, 0), ExperimentalFlag.spreadCollections: const Version(2, 0), - ExperimentalFlag.tripleShift: const Version(2, 11), - ExperimentalFlag.valueClass: const Version(2, 11), - ExperimentalFlag.variance: const Version(2, 11), + ExperimentalFlag.tripleShift: const Version(2, 10), + ExperimentalFlag.valueClass: const Version(2, 10), + ExperimentalFlag.variance: const Version(2, 10), +}; + +const Map experimentReleasedVersion = { + ExperimentalFlag.alternativeInvalidationStrategy: const Version(2, 10), + ExperimentalFlag.constantUpdate2018: const Version(2, 0), + ExperimentalFlag.controlFlowCollections: const Version(2, 0), + ExperimentalFlag.extensionMethods: const Version(2, 6), + ExperimentalFlag.nonNullable: const Version(2, 10), + ExperimentalFlag.nonfunctionTypeAliases: const Version(2, 10), + ExperimentalFlag.setLiterals: const Version(2, 0), + ExperimentalFlag.spreadCollections: const Version(2, 0), + ExperimentalFlag.tripleShift: const Version(2, 10), + ExperimentalFlag.valueClass: const Version(2, 10), + ExperimentalFlag.variance: const Version(2, 10), }; const AllowedExperimentalFlags defaultAllowedExperimentalFlags = diff --git a/pkg/kernel/lib/default_language_version.dart b/pkg/kernel/lib/default_language_version.dart index eb90980c64b..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, 11); +Version defaultLanguageVersion = const Version(2, 10); diff --git a/sdk/lib/_internal/js_runtime/pubspec.yaml b/sdk/lib/_internal/js_runtime/pubspec.yaml index f42b2cd99d7..96abf65bcbe 100644 --- a/sdk/lib/_internal/js_runtime/pubspec.yaml +++ b/sdk/lib/_internal/js_runtime/pubspec.yaml @@ -2,3 +2,5 @@ # make it easier to develop on dart2js. name: js_runtime publish_to: none +environment: + 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 79b69eedddf..8f46e5323ce 100644 --- a/sdk/lib/_internal/sdk_library_metadata/pubspec.yaml +++ b/sdk/lib/_internal/sdk_library_metadata/pubspec.yaml @@ -2,3 +2,5 @@ # make it easer to depend on libraries.dart from sdk packages like dart2js. name: sdk_library_metadata publish_to: none +environment: + sdk: '>=2.10.0-0.0 <3.0.0' diff --git a/tools/VERSION b/tools/VERSION index 123dec2110a..6e1aec2de51 100644 --- a/tools/VERSION +++ b/tools/VERSION @@ -25,7 +25,7 @@ # CHANNEL be MAJOR 2 -MINOR 11 +MINOR 10 PATCH 0 PRERELEASE 0 PRERELEASE_PATCH 0 diff --git a/tools/experimental_features.yaml b/tools/experimental_features.yaml index d750f93f84c..b7276b82200 100644 --- a/tools/experimental_features.yaml +++ b/tools/experimental_features.yaml @@ -93,7 +93,7 @@ # default 'language' "category" with code generated for both CFE and Analyzer, # while other categories can be tailored more specifically. -current-version: '2.11.0' +current-version: '2.10.0' features: non-nullable: