From d134afa2136717137eb238a285b6b50affe23ff4 Mon Sep 17 00:00:00 2001 From: Karol Stasiak Date: Thu, 7 Dec 2017 00:29:10 +0100 Subject: [PATCH] Proper version number in --version --- build.sbt | 12 ++++++------ src/main/scala/millfork/Main.scala | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index 1cc38069..c502bca4 100644 --- a/build.sbt +++ b/build.sbt @@ -27,9 +27,9 @@ mainClass in Compile := Some("millfork.Main") assemblyJarName := "millfork.jar" -//lazy val root = (project in file(".")). -// enablePlugins(BuildInfoPlugin). -// settings( -// buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion), -// buildInfoPackage := "hello" -// ) \ No newline at end of file +lazy val root = (project in file(".")). + enablePlugins(BuildInfoPlugin). + settings( + buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion), + buildInfoPackage := "millfork.buildinfo" + ) \ No newline at end of file diff --git a/src/main/scala/millfork/Main.scala b/src/main/scala/millfork/Main.scala index 37a9cc99..13f5235c 100644 --- a/src/main/scala/millfork/Main.scala +++ b/src/main/scala/millfork/Main.scala @@ -5,6 +5,7 @@ import java.nio.file.{Files, Paths} import java.util.Locale import millfork.assembly.opt.{CmosOptimizations, DangerousOptimizations, SuperOptimizer, UndocumentedOptimizations} +import millfork.buildinfo.BuildInfo import millfork.cli.{CliParser, CliStatus} import millfork.env.Environment import millfork.error.ErrorReporting @@ -239,7 +240,7 @@ object Main { }).description("Display this message.") flag("--version").action(c => { - println("millfork version ") + println("millfork version " + BuildInfo.version) assumeStatus(CliStatus.Quit) System.exit(0) c