diff --git a/build.sbt b/build.sbt index 36de2b3..4fc66be 100644 --- a/build.sbt +++ b/build.sbt @@ -113,3 +113,12 @@ lazy val morny_coeur = (project in file(MornyProject.morny_coeur.id)) lazy val root = (project in file (".")) .aggregate(morny_system_lib, morny_coeur) + .settings( + assembly / aggregate := false, + assembly := { + (morny_coeur / assembly).value + }, + run := { + (morny_coeur / Compile / run).evaluated + } + ) diff --git a/project/MornyConfiguration.scala b/project/MornyConfiguration.scala index a521f0a..3683be2 100644 --- a/project/MornyConfiguration.scala +++ b/project/MornyConfiguration.scala @@ -43,7 +43,7 @@ object MornyConfiguration { "com.github.spotbugs" % "spotbugs-annotations" % "4.8.4" % Compile, "cc.sukazyo" % "messiva" % "0.2.0", - "cc.sukazyo" % "resource-tools" % "0.3.0", + "cc.sukazyo" % "resource-tools" % "0.3.1", "com.github.pengrad" % "java-telegram-bot-api" % "6.2.0", @@ -70,14 +70,14 @@ object MornyConfiguration { override val group = GROUP override val root_package = s"$GROUP.cono.morny" - override val main_class = s"${this.root_package}.ServerMain" + override val main_class = s"${this.root_package}.core.ServerMain" override val dependencies = Seq( "com.github.spotbugs" % "spotbugs-annotations" % "4.8.4" % Compile, "cc.sukazyo" % "messiva" % "0.2.0", - "cc.sukazyo" % "resource-tools" % "0.3.0", + "cc.sukazyo" % "resource-tools" % "0.3.1", "com.github.pengrad" % "java-telegram-bot-api" % "6.2.0", "org.http4s" %% "http4s-dsl" % "0.23.27",