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

Merge pull request #3312 from smarter/zinc-main 

Use the new Zinc main class detection
This commit is contained in:
eugene yokota 2017-07-13 10:12:06 -04:00 committed by GitHub
parent 5f2e5cf10e cfc8a85fdf
commit 9429b76d67
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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