From 66c24c9e59cf10da6719e411665f8a00a13dd6ba Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Fri, 16 Sep 2011 22:04:51 -0400 Subject: [PATCH] Add standard manifest attributes before user options instead of after. Fixes #187 --- main/Defaults.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/Defaults.scala b/main/Defaults.scala index a83f49f4b..6371d5e96 100644 --- a/main/Defaults.scala +++ b/main/Defaults.scala @@ -321,8 +321,8 @@ object Defaults extends BuildCommon ) lazy val packageConfig: Seq[Setting[_]] = Seq( packageOptions in packageBin <<= (packageOptions, mainClass in packageBin, name, version, homepage, organization, organizationName) map { (p, main, name, ver, h, org, orgName) => - p ++ main.map(Package.MainClass.apply) :+ Package.addSpecManifestAttributes(name, ver, orgName) :+ Package.addImplManifestAttributes(name, ver, h, org, orgName) }, - packageOptions in packageSrc <<= (packageOptions, name, version, organizationName) map { _ :+ Package.addSpecManifestAttributes(_, _, _) }, + Package.addSpecManifestAttributes(name, ver, orgName) +: Package.addImplManifestAttributes(name, ver, h, org, orgName) +: main.map(Package.MainClass.apply) ++: p }, + packageOptions in packageSrc <<= (name, version, organizationName, packageOptions) map { Package.addSpecManifestAttributes(_, _, _) +: _ }, `package` <<= packageBin ) ++ packageTasks(packageBin, packageBinTask) ++