Upgrade sbt assembly, add exclusions to fix assembly step

broadinstitute · Apr 28, 2023 · fe3cb2a · fe3cb2a
1 parent d5b3c71
commit fe3cb2a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/pact4s/README.md b/pact4s/README.md
@@ -41,7 +41,7 @@ docker run --rm -v $PWD:/working \
                 -v jar-cache:/root/.ivy \
                 -v jar-cache:/root/.ivy2 \
                 -w /working \
-                sbtscala/scala-sbt:openjdk-11.0.14.1_1.5.5_2.13.9 \
+                sbtscala/scala-sbt:openjdk-11.0.16.1_1.5.5_2.13.9 \
                 sbt "project pact4s" clean test
 ```
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -798,6 +798,14 @@ object Dependencies {
      The jakarta.annotation inclusion is above in googleApiClientDependencies.
      */
     ExclusionRule("javax.annotation", "javax.annotation-api"),
+    ExclusionRule("javax.activation"),
+    ExclusionRule("javax.inject", "javax.inject"),
+
+    /*
+    The following exclusion rules are required to avoid conflicts with the http4s dependencies.
+     */
+    ExclusionRule("io.github.microutils"),
+    ExclusionRule("org.apache.httpcomponents.client5"),
   )
 
   val http4sDsl = "org.http4s" %% "http4s-dsl" % http4sV
@@ -814,6 +822,6 @@ object Dependencies {
     http4sDsl,
     http4sEmberServer,
     http4sCirce,
-    scalaTest
+    scalaTest,
   )
 }
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,5 +1,5 @@
 addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.9.0")
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.1")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1")
 addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.0")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.4")
 addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.2.16")