diff --git a/bsp b/bsp index faf8c0293a..fcc73a358d 160000 --- a/bsp +++ b/bsp @@ -1 +1 @@ -Subproject commit faf8c0293af388fdf90766b61d29d54a9ca67da2 +Subproject commit fcc73a358d69f991322287a754ec0354e9edd0e1 diff --git a/build.sbt b/build.sbt index d53a345516..d9b5181b98 100644 --- a/build.sbt +++ b/build.sbt @@ -405,6 +405,7 @@ def shadeSettingsForModule(moduleId: String, module: Reference) = List( "com.github.plokhotnyuk.jsoniter_scala", // Coursier direct and transitive deps "coursier", + "concurrentrefhashmap", "shapeless", "argonaut", "io.github.alexarchambault.windowsansi", @@ -506,7 +507,7 @@ def shadeSbtSettingsForModule( }.value }, shadeOwnNamespaces := Set("bloop"), - shadeIgnoredNamespaces := Set("com.google.gson"), + shadeIgnoredNamespaces := Set("com.google.gson", "scala"), toShadeJars := { val eclipseJarsUnsignedDir = (Keys.crossTarget.value / "eclipse-jars-unsigned").toPath java.nio.file.Files.createDirectories(eclipseJarsUnsignedDir) @@ -569,7 +570,8 @@ def shadeSbtSettingsForModule( "org.eclipse", "io.github.alexarchambault.windowsansi", "org.fusesource.hawtjni", - "org.fusesource.jansi" + "org.fusesource.jansi", + "concurrentrefhashmap" ) ) } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 03418cc0bc..cc1b4579d6 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -19,7 +19,7 @@ object Dependencies { val javaDebugVersion = "0.21.0+1-7f1080f1" val scalazVersion = "7.2.20" - val coursierVersion = "2.0.0-RC6-15" + val coursierVersion = "2.0.9" val scalaXmlVersion = "1.2.0" val lmVersion = "1.0.0" val configDirsVersion = "10" diff --git a/project/project/build.sbt b/project/project/build.sbt index eff1c79ce5..538e70cf2c 100644 --- a/project/project/build.sbt +++ b/project/project/build.sbt @@ -35,8 +35,8 @@ val sbtBloopBuildShadedJar = project "com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-macros" % "2.4.0", "org.zeroturnaround" % "zt-exec" % "1.11", "me.vican.jorge" %% "snailgun-cli" % "0.3.1", - "io.get-coursier" %% "coursier" % "2.0.0-RC3-4", - "io.get-coursier" %% "coursier-cache" % "2.0.0-RC3-4", + "io.get-coursier" %% "coursier" % "2.0.9", + "io.get-coursier" %% "coursier-cache" % "2.0.9", "ch.epfl.scala" % "bsp4j" % "2.0.0-M4+10-61e61e87" ), toShadeClasses := { @@ -76,7 +76,7 @@ val sbtBloopBuildShadedJar = project }, shadingNamespace := "shaded.build", - shadeIgnoredNamespaces := Set("com.google.gson", "org.slf4j"), + shadeIgnoredNamespaces := Set("com.google.gson", "org.slf4j", "scala"), shadeNamespaces := Set( "com.github.plokhotnyuk.jsoniter_scala", "machinist", @@ -87,6 +87,9 @@ val sbtBloopBuildShadedJar = project "macrocompat", "com.zaxxer.nuprocess", "coursier", + "io.github.alexarchambault", + "org.fusesource", + "concurrentrefhashmap", "shapeless", "argonaut", "org.checkerframework",