diff --git a/.gitignore b/.gitignore index 477eea9ea..1e1817089 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ target/ +.bsp/ # Metals / bloop .metals/ diff --git a/build.sbt b/build.sbt index eb385b4b9..b993c34d7 100644 --- a/build.sbt +++ b/build.sbt @@ -15,7 +15,7 @@ inThisBuild(List( ) )) -val coursierVersion0 = "2.0.0" +val coursierVersion0 = "2.0.5" lazy val `lm-coursier` = project .in(file("modules/lm-coursier")) @@ -62,6 +62,7 @@ lazy val `lm-coursier-shaded` = project libraryDependencies ++= Seq( "io.get-coursier" %% "coursier" % coursierVersion0, "io.github.alexarchambault" %% "data-class" % "0.2.3" % Provided, + "org.scala-lang.modules" %% "scala-collection-compat" % "2.2.0", "org.scala-lang.modules" %% "scala-xml" % "1.3.0", // depending on that one so that it doesn't get shaded "org.scala-sbt" %% "librarymanagement-ivy" % "1.3.4", "org.scalatest" %% "scalatest" % "3.2.2" % Test diff --git a/project/plugins.sbt b/project/plugins.sbt index 2e528533a..04d820e49 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,10 +1,7 @@ addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3") -addSbtPlugin(("io.github.alexarchambault.sbt" % "sbt-compatibility" % "0.0.8").exclude("com.typesafe", "sbt-mima-plugin")) +addSbtPlugin("io.github.alexarchambault.sbt" % "sbt-compatibility" % "0.0.8") addSbtPlugin("io.github.alexarchambault.sbt" % "sbt-eviction-rules" % "0.2.0") -addSbtPlugin("com.github.alexarchambault.tmp" % "sbt-mima-plugin" % "0.7.1-SNAPSHOT") - +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.8.1") addSbtPlugin("io.get-coursier" % "sbt-shading" % "2.0.0") libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value - -resolvers += Resolver.sonatypeRepo("snapshots")