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

Merge pull request #6523 from eatkins/discover-main-class 

Disable multiple main class warning w/ qualified key
This commit is contained in:
eugene yokota 2021-05-30 21:25:05 -04:00 committed by GitHub
parent ea2f496f5f 7dbf7978e9
commit a0f22213b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -982,12 +982,17 @@ object Defaults extends BuildCommon {
selectMainClass := mainClass.value orElse askForMainClass(discoveredMainClasses.value), selectMainClass := mainClass.value orElse askForMainClass(discoveredMainClasses.value),
run / mainClass := (run / selectMainClass).value, run / mainClass := (run / selectMainClass).value,
mainClass := { mainClass := {
val logWarning = state.value.currentCommand val logWarning = state.value.currentCommand.forall(!_.commandLine.split(" ").exists {
.flatMap(_.commandLine.split(" ").headOption.map(_.trim)) case "run" | "runMain" => true
.fold(true) { case r =>
case "run" | "runMain" => false r.split("/") match {
case _ => true case Array(parts @ _*) =>
} parts.lastOption match {
case Some("run" | "runMain") => true
case _ => false
}
}
})
pickMainClassOrWarn(discoveredMainClasses.value, streams.value.log, logWarning) pickMainClassOrWarn(discoveredMainClasses.value, streams.value.log, logWarning)
}, },
runMain := foregroundRunMainTask.evaluated, runMain := foregroundRunMainTask.evaluated,