Skip to content

support detecting dotty plugins #529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 25, 2018
Merged

support detecting dotty plugins #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06d8e87
support detect dotty plugins
liufengyun Apr 9, 2018
118bf16
fix mima
dwijnand Apr 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Util._
import Dependencies._
import Scripted._
import com.typesafe.tools.mima.core._, ProblemFilters._

def internalPath = file("internal")

Expand Down Expand Up @@ -489,6 +490,10 @@ lazy val zincClasspath = (project in internalPath / "zinc-classpath")
compilerVersionDependentScalacOptions,
libraryDependencies ++= Seq(scalaCompiler.value, launcherInterface),
mimaSettings,
mimaBinaryIssueFilters ++= Seq(
// Changed the signature of a private[sbt] method
exclude[DirectMissingMethodProblem]("sbt.internal.inc.classpath.ClasspathUtilities.compilerPlugins"),
),
)
.configure(addSbtIO)

Expand Down
5 changes: 3 additions & 2 deletions internal/zinc-classpath/src/main/scala/sbt/internal/inc/classpath/ClasspathUtilities.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,11 @@ object ClasspathUtilities {
} catch { case _: Exception => false }

/** Returns all entries in 'classpath' that correspond to a compiler plugin.*/
private[sbt] def compilerPlugins(classpath: Seq[File]): Iterable[File] = {
private[sbt] def compilerPlugins(classpath: Seq[File], isDotty: Boolean): Iterable[File] = {
import collection.JavaConversions._
val loader = new URLClassLoader(Path.toURLs(classpath))
loader.getResources("scalac-plugin.xml").toList.flatMap(asFile(true))
val metaFile = if (isDotty) "plugin.properties" else "scalac-plugin.xml"
loader.getResources(metaFile).toList.flatMap(asFile(true))
}

/** Converts the given URL to a File. If the URL is for an entry in a jar, the File for the jar is returned. */
Expand Down