luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix compilation error

This commit is contained in:
Liu Fengyun 2018-05-03 22:36:17 +02:00
parent 06cf5e5635
commit ecbfdfef25
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/src/main/scala/sbt/Defaults.scala
View File

@ -2885,10 +2885,9 @@ object Classpaths {
excl: FileFilter): Classpath = excl: FileFilter): Classpath =
(base * (filter -- excl) +++ (base / config.name).descendantsExcept(filter, excl)).classpath (base * (filter -- excl) +++ (base / config.name).descendantsExcept(filter, excl)).classpath
def autoPlugins(report: UpdateReport, internalPluginClasspath: Seq[File]): Seq[String] = { def autoPlugins(report: UpdateReport, internalPluginClasspath: Seq[File], scalaVersion: String): Seq[String] = {
val pluginClasspath = report.matching(configurationFilter(CompilerPlugin.name)) ++ internalPluginClasspath val pluginClasspath = report.matching(configurationFilter(CompilerPlugin.name)) ++ internalPluginClasspath
val version = scalaVersion.value val plugins = sbt.internal.inc.classpath.ClasspathUtilities.compilerPlugins(pluginClasspath, ScalaInstance.isDotty(scalaVersion))
val plugins = sbt.internal.inc.classpath.ClasspathUtilities.compilerPlugins(pluginClasspath, scalaInstance.isDotty(version))
plugins.map("-Xplugin:" + _.getAbsolutePath).toSeq plugins.map("-Xplugin:" + _.getAbsolutePath).toSeq
} }
@ -2908,7 +2907,7 @@ object Classpaths {
lazy val compilerPluginConfig = Seq( lazy val compilerPluginConfig = Seq(
scalacOptions := { scalacOptions := {
val options = scalacOptions.value val options = scalacOptions.value
val newPlugins = autoPlugins(update.value, internalCompilerPluginClasspath.value.files) val newPlugins = autoPlugins(update.value, internalCompilerPluginClasspath.value.files, scalaVersion.value)
val existing = options.toSet val existing = options.toSet
if (autoCompilerPlugins.value) options ++ newPlugins.filterNot(existing) else options if (autoCompilerPlugins.value) options ++ newPlugins.filterNot(existing) else options
} }