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

Merge pull request #3855 from eed3si9n/wip/compiler-plugin 

Filter auto compiler plugin to classpath JARs
This commit is contained in:
Dale Wijnand 2018-01-08 11:19:04 +00:00 committed by GitHub
parent 4fd01afdb5 68f547a465
commit 47f8641f7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1933,12 +1933,20 @@ object Classpaths {
@deprecated("Specify the classpath that includes internal dependencies", "0.13.0")
def autoPlugins(report: UpdateReport): Seq[String] = autoPlugins(report, Nil)
@deprecated("Specify the jarTypes", "0.13.17")
def autoPlugins(report: UpdateReport, internalPluginClasspath: Seq[File]): Seq[String] =
{
val pluginClasspath = report.matching(configurationFilter(CompilerPlugin.name)) ++ internalPluginClasspath
val plugins = classpath.ClasspathUtilities.compilerPlugins(pluginClasspath)
plugins.map("-Xplugin:" + _.getAbsolutePath).toSeq
}
autoPlugins(report, internalPluginClasspath, Set("jar", "bundle"))
def autoPlugins(
report: UpdateReport,
internalPluginClasspath: Seq[File],
jarTypes: Set[String]): Seq[String] = {
val pluginClasspath = report.matching(configurationFilter(CompilerPlugin.name) &&
artifactFilter(`type` = jarTypes)) ++ internalPluginClasspath
val plugins = classpath.ClasspathUtilities.compilerPlugins(pluginClasspath)
plugins.map("-Xplugin:" + _.getAbsolutePath).toSeq
}
private[this] lazy val internalCompilerPluginClasspath: Initialize[Task[Classpath]] =
(thisProjectRef, settingsData, buildDependencies) flatMap { (ref, data, deps) =>
@ -1948,7 +1956,7 @@ object Classpaths {
lazy val compilerPluginConfig = Seq(
scalacOptions := {
val options = scalacOptions.value
val newPlugins = autoPlugins(update.value, internalCompilerPluginClasspath.value.files)
val newPlugins = autoPlugins(update.value, internalCompilerPluginClasspath.value.files, classpathTypes.value)
val existing = options.toSet
if (autoCompilerPlugins.value) options ++ newPlugins.filterNot(existing) else options
}