Version 2.10.0-7.2.beta
* Cherry-pick refs/changes/42/158842/2 to beta
diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json
index 706d694..2fe74a3 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-08-07T16:47:24.963156",
+ "generated": "2020-07-14T07:50:57.318843",
"generator": "tools/generate_package_config.dart",
"packages": [
{
@@ -21,41 +21,6 @@
"languageVersion": "2.2"
},
{
- "name": "_fe_analyzer_shared_assigned_variables",
- "rootUri": "../pkg/_fe_analyzer_shared/test/flow_analysis/assigned_variables",
- "packageUri": ".nonexisting/"
- },
- {
- "name": "_fe_analyzer_shared_definite_assignment",
- "rootUri": "../pkg/_fe_analyzer_shared/test/flow_analysis/definite_assignment",
- "packageUri": ".nonexisting/"
- },
- {
- "name": "_fe_analyzer_shared_definite_unassignment",
- "rootUri": "../pkg/_fe_analyzer_shared/test/flow_analysis/definite_unassignment",
- "packageUri": ".nonexisting/"
- },
- {
- "name": "_fe_analyzer_shared_inheritance",
- "rootUri": "../pkg/_fe_analyzer_shared/test/inheritance",
- "packageUri": ".nonexisting/"
- },
- {
- "name": "_fe_analyzer_shared_nullability",
- "rootUri": "../pkg/_fe_analyzer_shared/test/flow_analysis/nullability",
- "packageUri": ".nonexisting/"
- },
- {
- "name": "_fe_analyzer_shared_reachability",
- "rootUri": "../pkg/_fe_analyzer_shared/test/flow_analysis/reachability",
- "packageUri": ".nonexisting/"
- },
- {
- "name": "_fe_analyzer_shared_type_promotion",
- "rootUri": "../pkg/_fe_analyzer_shared/test/flow_analysis/type_promotion",
- "packageUri": ".nonexisting/"
- },
- {
"name": "_js_interop_checks",
"rootUri": "../pkg/_js_interop_checks",
"packageUri": "lib/",
@@ -83,7 +48,7 @@
"name": "analyzer",
"rootUri": "../pkg/analyzer",
"packageUri": "lib/",
- "languageVersion": "2.7"
+ "languageVersion": "2.6"
},
{
"name": "analyzer_cli",
@@ -142,7 +107,7 @@
"name": "charcode",
"rootUri": "../third_party/pkg/charcode",
"packageUri": "lib/",
- "languageVersion": "2.9"
+ "languageVersion": "2.10"
},
{
"name": "cli_util",
@@ -391,6 +356,7 @@
{
"name": "language_versioning_2.7_test",
"rootUri": "../pkg/language_versioning_2.7_test",
+ "packageUri": "lib/",
"languageVersion": "2.7"
},
{
@@ -409,7 +375,7 @@
"name": "markdown",
"rootUri": "../third_party/pkg/markdown",
"packageUri": "lib/",
- "languageVersion": "2.6"
+ "languageVersion": "2.2"
},
{
"name": "matcher",
@@ -600,7 +566,7 @@
"name": "sse",
"rootUri": "../third_party/pkg/sse",
"packageUri": "lib/",
- "languageVersion": "2.2"
+ "languageVersion": "2.6"
},
{
"name": "stack_trace",
@@ -636,7 +602,7 @@
"name": "sync_http",
"rootUri": "../third_party/pkg/sync_http",
"packageUri": "lib/",
- "languageVersion": "2.0"
+ "languageVersion": "2.6"
},
{
"name": "telemetry",
@@ -747,6 +713,12 @@
"languageVersion": "2.2"
},
{
+ "name": "webdriver",
+ "rootUri": "../third_party/pkg/webdriver",
+ "packageUri": "lib/",
+ "languageVersion": "2.6"
+ },
+ {
"name": "web_components",
"rootUri": "../third_party/pkg/web_components",
"packageUri": "lib/",
@@ -759,16 +731,10 @@
"languageVersion": "2.0"
},
{
- "name": "webdriver",
- "rootUri": "../third_party/pkg/webdriver",
- "packageUri": "lib/",
- "languageVersion": "2.0"
- },
- {
"name": "yaml",
"rootUri": "../third_party/pkg/yaml",
"packageUri": "lib/",
"languageVersion": "2.4"
}
]
-}
\ No newline at end of file
+}
diff --git a/tools/VERSION b/tools/VERSION
index 6ee8dfe..c98bb35 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
MINOR 10
PATCH 0
PRERELEASE 7
-PRERELEASE_PATCH 1
+PRERELEASE_PATCH 2
diff --git a/tools/generate_package_config.dart b/tools/generate_package_config.dart
index 0caf03b..169fbbc 100755
--- a/tools/generate_package_config.dart
+++ b/tools/generate_package_config.dart
@@ -34,25 +34,9 @@
packageDirectory('pkg/front_end/testcases/nonfunction_type_aliases/'),
];
- var feAnalyzerSharedPackageDirs = [
- packageDirectory(
- 'pkg/_fe_analyzer_shared/test/flow_analysis/assigned_variables/'),
- packageDirectory(
- 'pkg/_fe_analyzer_shared/test/flow_analysis/definite_assignment/'),
- packageDirectory(
- 'pkg/_fe_analyzer_shared/test/flow_analysis/definite_unassignment/'),
- packageDirectory('pkg/_fe_analyzer_shared/test/flow_analysis/nullability/'),
- packageDirectory(
- 'pkg/_fe_analyzer_shared/test/flow_analysis/reachability/'),
- packageDirectory(
- 'pkg/_fe_analyzer_shared/test/flow_analysis/type_promotion/'),
- packageDirectory('pkg/_fe_analyzer_shared/test/inheritance/'),
- ];
-
var packages = [
...makePackageConfigs(packageDirs),
- ...makeCfePackageConfigs(cfePackageDirs),
- ...makeFeAnalyzerSharedPackageConfigs(feAnalyzerSharedPackageDirs)
+ ...makeCfePackageConfigs(cfePackageDirs)
];
packages.sort((a, b) => a["name"].compareTo(b["name"]));
@@ -123,21 +107,6 @@
}
}
-/// Generates package configurations for the special pseudo-packages used by
-/// the _fe_analyzer_shared id tests.
-Iterable<Map<String, String>> makeFeAnalyzerSharedPackageConfigs(
- List<String> packageDirs) sync* {
- for (var packageDir in packageDirs) {
- yield {
- 'name': '_fe_analyzer_shared_${p.basename(packageDir)}',
- 'rootUri': p
- .toUri(p.relative(packageDir, from: p.dirname(configFilePath)))
- .toString(),
- 'packageUri': '.nonexisting/',
- };
- }
-}
-
/// Generates a path to [relativePath] within the repo.
String packageDirectory(String relativePath) => p.join(repoRoot, relativePath);
