From 55d8792f22ebf51a8d9675995add0daf259e1984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Tue, 9 Nov 2021 09:21:43 +0100 Subject: [PATCH] Fix a bug inside UsingCompilerPluginDirectiveHandler --- .../directives/UsingCompilerPluginDirectiveHandler.scala | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/build/src/main/scala/scala/build/preprocessing/directives/UsingCompilerPluginDirectiveHandler.scala b/modules/build/src/main/scala/scala/build/preprocessing/directives/UsingCompilerPluginDirectiveHandler.scala index 6552572a29..2778710217 100644 --- a/modules/build/src/main/scala/scala/build/preprocessing/directives/UsingCompilerPluginDirectiveHandler.scala +++ b/modules/build/src/main/scala/scala/build/preprocessing/directives/UsingCompilerPluginDirectiveHandler.scala @@ -6,7 +6,7 @@ import dependency.parser.DependencyParser import scala.build.EitherCps.{either, value} import scala.build.Ops._ import scala.build.errors.{BuildException, CompositeBuildException, DependencyFormatError} -import scala.build.options.{BuildOptions, ClassPathOptions, ScalaOptions} +import scala.build.options.{BuildOptions, ScalaOptions} import scala.build.preprocessing.ScopePath import scala.build.{Position, Positioned} @@ -43,7 +43,7 @@ case object UsingCompilerPluginDirectiveHandler extends UsingDirectiveHandler { DependencyParser.parse(depStr) .left.map(err => new DependencyFormatError(depStr, err)) - override def keys = Seq("lib", "libs") + override def keys = Seq("plugin", "plugins") override def handleValues( values: Seq[Any], cwd: ScopePath, @@ -63,9 +63,8 @@ case object UsingCompilerPluginDirectiveHandler extends UsingDirectiveHandler { } BuildOptions( - classPathOptions = ClassPathOptions( - extraDependencies = extraDependencies - .map(Positioned.none(_)) + scalaOptions = ScalaOptions( + compilerPlugins = extraDependencies.map(Positioned.none(_)) ) ) }