Skip to content

Commit

Permalink
Bump sbt to 1.5.4 (close #68)
Browse files Browse the repository at this point in the history
  • Loading branch information
istreeter committed Aug 2, 2021
1 parent 7da704e commit c717722
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ lazy val root = (project in file("."))
"-Ywarn-unused:privates", // Warn if a private member is unused.
"-Ywarn-value-discard" // Warn when non-Unit expression results are unused.
),
cancelable in Global := true,
scalacOptions in (Compile, console) --= Seq("-Ywarn-unused:imports", "-Xfatal-warnings")
Global / cancelable := true,
Compile / console / scalacOptions --= Seq("-Ywarn-unused:imports", "-Xfatal-warnings")
)
.settings(BuildSettings.dockerSettings)
.enablePlugins(JavaAppPackaging)
Expand Down
12 changes: 6 additions & 6 deletions project/BuildSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@ object BuildSettings {

lazy val dockerSettings = Seq(
dockerBaseImage := "adoptopenjdk:11-jre-hotspot-focal",
maintainer in Docker := "Snowplow Analytics Ltd. <[email protected]>",
Docker / maintainer := "Snowplow Analytics Ltd. <[email protected]>",
dockerUpdateLatest := true,
dockerRepository := Some("snowplow"),
daemonUserUid in Docker := None,
daemonUser in Docker := "daemon",
defaultLinuxInstallLocation in Docker := "/opt/snowplow",
Docker / daemonUserUid := None,
Docker / daemonUser := "daemon",
Docker / defaultLinuxInstallLocation := "/opt/snowplow",
dockerCmd := Seq("--help")
)

lazy val assemblySettings = Seq(
assemblyJarName in assembly := { s"${name.value}-${version.value}.jar" },
assemblyMergeStrategy in assembly := {
assembly / assemblyJarName := { s"${name.value}-${version.value}.jar" },
assembly / assemblyMergeStrategy := {
case x if x.endsWith("module-info.class") => MergeStrategy.first
case x if x.endsWith("nowarn.class") => MergeStrategy.first
case x =>
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.2.8
sbt.version=1.5.4

0 comments on commit c717722

Please sign in to comment.