From 7641de1ca0b727a8a9755b2ba2bf5bdc07fc12fc Mon Sep 17 00:00:00 2001
From: Tom Wiesing <tkw01536@gmail.com>
Date: Wed, 20 Dec 2017 11:21:08 +0100
Subject: [PATCH] Fix sbt fatjar regression (closes #278)

In a previous commit, a regression was introduced that prevent the 'main
manifest attribute' to be set within jar generated by `sbt deploy` and
`sbt deployFull`.

The regression was caused by a scoping issue within sbt keys. This
commit fixes the regression by explicitly setting the `mainClass in
assembly` taskKey.
---
 src/build.sbt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/build.sbt b/src/build.sbt
index 4ada415c41..7b8ffa5141 100644
--- a/src/build.sbt
+++ b/src/build.sbt
@@ -8,6 +8,7 @@ import sbt.Keys._
 version in ThisBuild := "1.0.1"
 isSnapshot in ThisBuild := true
 organization in ThisBuild := "info.kwarc.mmt"
+lazy val mmtMainClass = "info.kwarc.mmt.api.frontend.Run"
 
 // =================================
 // GLOBAL SETTINGS
@@ -19,7 +20,6 @@ parallelExecution in ThisBuild := false
 javaOptions in ThisBuild ++= Seq("-Xmx1g")
 
 connectInput in run := true
-mainClass in Compile := Some("info.kwarc.mmt.api.frontend.Run")
 
 publish := {}
 fork in Test := true
@@ -67,7 +67,7 @@ def commonSettings(nameStr: String) = Seq(
   assemblyMergeStrategy in assembly := {
     case
       PathList("rootdoc.txt") | // 2 versions from from scala jars
-      PathList("META-INF", "MANIFEST.MF") => // should never be merged anyway
+      PathList("META-INF", _*) => // should never be merged anyway
       MergeStrategy.discard
     // work around weird behavior of default strategy, which renames files for no apparent reason
     case _ => MergeStrategy.singleOrError
@@ -127,11 +127,12 @@ lazy val mmt = (project in file("mmt")).
       assembly in Compile map Utils.deployTo(Utils.deploy / "mmt.jar")
     }.value,
     deployFull := deployFull.dependsOn(deploy).value,
-    mainClass in assembly := (mainClass in Compile).value,
     assemblyExcludedJars in assembly := {
       val cp = (fullClasspath in assembly).value
       cp filter { j => jeditJars.contains(j.data.getName) }
     },
+    mainClass in Compile := Some(mmtMainClass), 
+    mainClass in assembly := Some(mmtMainClass), 
     assemblyOption in assembly := (assemblyOption in assembly).value.copy(
       prependShellScript = Some(Seq("#!/bin/bash", """exec /usr/bin/java -Xmx2048m -jar "$0" "$@"""")))
   )