Skip to content

Commit

Permalink
update sbt to 1.8.2 and change "in" syntax to "/"
Browse files Browse the repository at this point in the history
  • Loading branch information
neowit committed Jun 14, 2023
1 parent efadc87 commit a0f9414
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions assembly.sbt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.3.13
sbt.version=1.8.2

0 comments on commit a0f9414

Please sign in to comment.