Skip to content

Commit

Permalink
Bump sbt-assembly and sbt-buildinfo versions
Browse files Browse the repository at this point in the history
  • Loading branch information
jad-hamza committed Oct 28, 2021
1 parent d2ef0d8 commit 61f5ae1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,10 @@ lazy val assemblySettings: Seq[Setting[_]] = {

Seq(
assembly / assemblyMergeStrategy := {
// The BuildInfo class file from the current project comes before the one from `stainless-scalac`,
// The BuildInfo class file from the current project comes after the one from `stainless-scalac`,
// hence the following merge strategy picks the standalone BuildInfo over the usual one.
case "stainless/BuildInfo.class" => MergeStrategy.first
case "stainless/BuildInfo$.class" => MergeStrategy.first
case "stainless/BuildInfo.class" => MergeStrategy.last
case "stainless/BuildInfo$.class" => MergeStrategy.last
case PathList("META-INF", xs @ _*) => MergeStrategy.discard
case PathList("scala", "collection", "compat", _*) => MergeStrategy.first
case PathList("scala", "annotation", _*) => MergeStrategy.first
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.2")

addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")

addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.3")

addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")

addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.4.0")

addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.0")

0 comments on commit 61f5ae1

Please sign in to comment.