Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update coursier to 2.0.9 #1446

Merged
merged 1 commit into from
Jan 28, 2021
Merged

Update coursier to 2.0.9 #1446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bsp
Open in desktop
Submodule bsp updated from faf8c0 to fcc73a
6 changes: 4 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -506,7 +507,7 @@ def shadeSbtSettingsForModule(
}.value
},
shadeOwnNamespaces := Set("bloop"),
shadeIgnoredNamespaces := Set("com.google.gson"),
shadeIgnoredNamespaces := Set("com.google.gson", "scala"),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is scala added here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Due to the collection-compat library that is brought in by coursier. It should be binary compatible and has a nice Mima job, so we should be fine, so we cna ignore it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, but collection-compat is not the only artifact that use the scala namespace. What about the scala library?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So that did not pop up as being a problem and it should also be binary compatible for any major version.

Besides, we are already doing it for example here: https://github.com/scalacenter/bloop/blob/master/build.sbt#L394

toShadeJars := {
val eclipseJarsUnsignedDir = (Keys.crossTarget.value / "eclipse-jars-unsigned").toPath
java.nio.file.Files.createDirectories(eclipseJarsUnsignedDir)
Expand Down Expand Up @@ -569,7 +570,8 @@ def shadeSbtSettingsForModule(
"org.eclipse",
"io.github.alexarchambault.windowsansi",
"org.fusesource.hawtjni",
"org.fusesource.jansi"
"org.fusesource.jansi",
"concurrentrefhashmap"
)
)
}
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 6 additions & 3 deletions project/project/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 := {
Expand Down Expand Up @@ -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",
Expand All @@ -87,6 +87,9 @@ val sbtBloopBuildShadedJar = project
"macrocompat",
"com.zaxxer.nuprocess",
"coursier",
"io.github.alexarchambault",
"org.fusesource",
"concurrentrefhashmap",
"shapeless",
"argonaut",
"org.checkerframework",
Expand Down