From a0f9414aea019c228677ad9fa1c5398054e6c992 Mon Sep 17 00:00:00 2001 From: "A. G" Date: Wed, 14 Jun 2023 19:02:05 +0100 Subject: [PATCH] update sbt to 1.8.2 and change "in" syntax to "/" --- assembly.sbt | 10 +++++----- project/build.properties | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/assembly.sbt b/assembly.sbt index 2b4e210..04981a8 100644 --- a/assembly.sbt +++ b/assembly.sbt @@ -1,9 +1,9 @@ -mainClass in assembly := Some("com.neowit.apex.Runner") +assembly / mainClass := Some("com.neowit.apex.Runner") //uncomment line below to disable tests during build -test in assembly := {} +assembly / test := {} -assemblyMergeStrategy in assembly := { +assembly / assemblyMergeStrategy := { case x if x.endsWith(".java") => MergeStrategy.discard case "commands.txt" => MergeStrategy.discard case x if x.endsWith(".g4") => MergeStrategy.discard @@ -19,11 +19,11 @@ assemblyMergeStrategy in assembly := { //case PathList("jackson-core-2.10.3.jar", xs @ _*) => MergeStrategy.last //case PathList("jackson-databind-2.10.3.jar", xs @ _*) => MergeStrategy.last case x => - val oldStrategy = (assemblyMergeStrategy in assembly).value + val oldStrategy = (assembly / assemblyMergeStrategy).value oldStrategy(x) } //assemblyOption in assembly ~= { _.copy(includeScala = false) } -assemblyOption in assembly ~= { _.copy(includeScala = true) } +assembly / assemblyOption ~= { _.copy(includeScala = true) } //assemblyOutputPath in assembly := baseDirectory.value //logLevel in assembly := Level.Debug \ No newline at end of file diff --git a/project/build.properties b/project/build.properties index 0837f7a..46e43a9 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.13 +sbt.version=1.8.2