Use the new Zinc main class detection

See https://github.com/sbt/zinc/pull/287 for details.
This commit is contained in:
Guillaume Martres 2017-07-10 22:39:01 +02:00
parent 5f2e5cf10e
commit cfc8a85fdf
1 changed files with 4 additions and 6 deletions

View File

@ -78,7 +78,6 @@ import xsbti.compile.IncToolOptionsUtil
import xsbti.CrossValue
// incremental compiler
import xsbt.api.Discovery
import xsbti.compile.{
ClassFileManagerType,
ClasspathOptionsUtil,
@ -1328,11 +1327,10 @@ object Defaults extends BuildCommon {
bgCopyClasspath in bgRunMain,
runner in run).evaluated
def discoverMainClasses(analysis: CompileAnalysis): Seq[String] =
Discovery
.applications(Tests.allDefs(analysis))
.collect({ case (definition, discovered) if discovered.hasMain => definition.name })
.sorted
def discoverMainClasses(analysis: CompileAnalysis): Seq[String] = analysis match {
case analysis: Analysis =>
analysis.infos.allInfos.values.map(_.getMainClasses).flatten.toSeq.sorted
}
def consoleProjectTask =
Def.task {