From f092fb35c91807d03bbbedada4d65a2b8870adeb Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Wed, 25 Jan 2012 17:29:51 -0500 Subject: [PATCH] When *::main-class is set, use its value for run::main-class --- main/Defaults.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/Defaults.scala b/main/Defaults.scala index 720928af6..ed48c0a0f 100644 --- a/main/Defaults.scala +++ b/main/Defaults.scala @@ -218,7 +218,7 @@ object Defaults extends BuildCommon discoveredMainClasses <<= compile map discoverMainClasses storeAs discoveredMainClasses triggeredBy compile, definedSbtPlugins <<= discoverPlugins, inTask(run)(runnerTask :: Nil).head, - selectMainClass <<= discoveredMainClasses map selectRunMain, + selectMainClass <<= (discoveredMainClasses, mainClass) map { (classes, explicit) => explicit orElse selectRunMain(classes) }, mainClass in run <<= selectMainClass in run, mainClass <<= discoveredMainClasses map selectPackageMain, run <<= runTask(fullClasspath, mainClass in run, runner in run),