mirror of https://github.com/sbt/sbt.git
Merge pull request #6523 from eatkins/discover-main-class
Disable multiple main class warning w/ qualified key
This commit is contained in:
commit
a0f22213b5
|
|
@ -982,12 +982,17 @@ object Defaults extends BuildCommon {
|
|||
selectMainClass := mainClass.value orElse askForMainClass(discoveredMainClasses.value),
|
||||
run / mainClass := (run / selectMainClass).value,
|
||||
mainClass := {
|
||||
val logWarning = state.value.currentCommand
|
||||
.flatMap(_.commandLine.split(" ").headOption.map(_.trim))
|
||||
.fold(true) {
|
||||
case "run" | "runMain" => false
|
||||
case _ => true
|
||||
}
|
||||
val logWarning = state.value.currentCommand.forall(!_.commandLine.split(" ").exists {
|
||||
case "run" | "runMain" => true
|
||||
case r =>
|
||||
r.split("/") match {
|
||||
case Array(parts @ _*) =>
|
||||
parts.lastOption match {
|
||||
case Some("run" | "runMain") => true
|
||||
case _ => false
|
||||
}
|
||||
}
|
||||
})
|
||||
pickMainClassOrWarn(discoveredMainClasses.value, streams.value.log, logWarning)
|
||||
},
|
||||
runMain := foregroundRunMainTask.evaluated,
|
||||
|
|
|
|||
Loading…
Reference in New Issue