DAS plugins: Make a constraint on the analysis_server_plugin package instead of the others Fixes https://github.com/dart-lang/sdk/issues/61182 Change-Id: I46cff3e599ae63fb718a1e05778afa05be50ab79 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/441835 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Samuel Rawlins <srawlins@google.com>
diff --git a/pkg/analysis_server/lib/src/plugin2/analyzer_version.g.dart b/pkg/analysis_server/lib/src/plugin2/analyzer_version.g.dart index 555a9ab..ec3cb9e 100644 --- a/pkg/analysis_server/lib/src/plugin2/analyzer_version.g.dart +++ b/pkg/analysis_server/lib/src/plugin2/analyzer_version.g.dart
@@ -4,13 +4,10 @@ // THIS FILE IS GENERATED. DO NOT EDIT. // -// Instead, run 'dart pkg/analysis_server/tool/generate_analyzer_version.dart' +// Instead, run +// 'dart pkg/analysis_server/tool/generate_analysis_server_plugin_version.dart' // to update this file. -/// The version of the analyzer_plugin package that matches the analyzer_plugin -/// code used by the analysis_server package. -var analyzerPluginVersion = '0.13.0'; - -/// The version of the analyzer package that matches the analyzer code used by -/// the analysis_server package. -var analyzerVersion = '7.3.0'; +/// The version of the analysis_server_plugin package that matches the protocol +/// used by the analysis_server package. +var analysisServerPluginVersion = '0.2.0';
diff --git a/pkg/analysis_server/lib/src/plugin2/generator.dart b/pkg/analysis_server/lib/src/plugin2/generator.dart index 998f728..d68a472 100644 --- a/pkg/analysis_server/lib/src/plugin2/generator.dart +++ b/pkg/analysis_server/lib/src/plugin2/generator.dart
@@ -64,8 +64,7 @@ environment: sdk: ^3.6.0 dependencies: - analyzer: '$analyzerVersion' - analyzer_plugin: '$analyzerPluginVersion' + analysis_server_plugin: '$analysisServerPluginVersion' '''); for (var configuration in _pluginConfigurations) {
diff --git a/pkg/analysis_server/test/src/plugin2/generator_test.dart b/pkg/analysis_server/test/src/plugin2/generator_test.dart index ebe47c3..9972f20 100644 --- a/pkg/analysis_server/test/src/plugin2/generator_test.dart +++ b/pkg/analysis_server/test/src/plugin2/generator_test.dart
@@ -69,8 +69,7 @@ pluginPackageGenerator.generatePubspec(), contains(''' dependencies: - analyzer: '$analyzerVersion' - analyzer_plugin: '$analyzerPluginVersion' + analysis_server_plugin: '$analysisServerPluginVersion' no_bools: git: url: https://example.com/example.git @@ -93,8 +92,7 @@ pluginPackageGenerator.generatePubspec(), contains(''' dependencies: - analyzer: '$analyzerVersion' - analyzer_plugin: '$analyzerPluginVersion' + analysis_server_plugin: '$analysisServerPluginVersion' no_bools: path: ../no_bools_plugin no_ints: @@ -129,8 +127,7 @@ pluginPackageGenerator.generatePubspec(), contains(''' dependencies: - analyzer: '$analyzerVersion' - analyzer_plugin: '$analyzerPluginVersion' + analysis_server_plugin: '$analysisServerPluginVersion' no_bools: ^1.0.0 no_ints: ^1.2.0 '''),
diff --git a/pkg/analysis_server/tool/generate_analyzer_version.dart b/pkg/analysis_server/tool/generate_analysis_server_plugin_version.dart similarity index 64% rename from pkg/analysis_server/tool/generate_analyzer_version.dart rename to pkg/analysis_server/tool/generate_analysis_server_plugin_version.dart index 349b748..ddf6fa9 100644 --- a/pkg/analysis_server/tool/generate_analyzer_version.dart +++ b/pkg/analysis_server/tool/generate_analysis_server_plugin_version.dart
@@ -25,25 +25,19 @@ // THIS FILE IS GENERATED. DO NOT EDIT. // -// Instead, run 'dart pkg/analysis_server/tool/generate_analyzer_version.dart' +// Instead, run +// 'dart pkg/analysis_server/tool/generate_analysis_server_plugin_version.dart' // to update this file. '''); - var analyzerPluginVersion = versionFromPubspec( - normalize(join(packageRoot, 'analyzer_plugin', 'pubspec.yaml')), - ); - var analyzerVersion = versionFromPubspec( - normalize(join(packageRoot, 'analyzer', 'pubspec.yaml')), + var analysisServerPluginVersion = versionFromPubspec( + normalize(join(packageRoot, 'analysis_server_plugin', 'pubspec.yaml')), ); buffer.write(''' -/// The version of the analyzer_plugin package that matches the analyzer_plugin -/// code used by the analysis_server package. -var analyzerPluginVersion = '$analyzerPluginVersion'; - -/// The version of the analyzer package that matches the analyzer code used by -/// the analysis_server package. -var analyzerVersion = '$analyzerVersion'; +/// The version of the analysis_server_plugin package that matches the protocol +/// used by the analysis_server package. +var analysisServerPluginVersion = '$analysisServerPluginVersion'; '''); return buffer.toString();