From 2d3f57ad5196568b4da07d45e845d38c87449a1a Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Sat, 25 Oct 2014 14:25:30 -0400 Subject: [PATCH] Fix the run logic so the mainClass setting is actually used when set. --- main/src/main/scala/sbt/Defaults.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 6639955fe..9ff1760de 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -264,7 +264,7 @@ object Defaults extends BuildCommon { definedSbtPlugins <<= discoverPlugins, discoveredSbtPlugins <<= discoverSbtPluginNames, inTask(run)(runnerTask :: Nil).head, - selectMainClass := pickMainClass(discoveredMainClasses.value) orElse askForMainClass(discoveredMainClasses.value), + selectMainClass := mainClass.value orElse askForMainClass(discoveredMainClasses.value), mainClass in run := (selectMainClass in run).value, mainClass := pickMainClassOrWarn(discoveredMainClasses.value, streams.value.log), run <<= runTask(fullClasspath, mainClass in run, runner in run),