luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5555 from alexarchambault/bump-lm-coursier 

Update coursier to 2.0.0-RC6-4
This commit is contained in:
eugene yokota 2020-05-14 13:01:14 -04:00 committed by GitHub
parent 56a613fb82 f850a9c966
commit 7e806effa2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/src/main/scala/sbt/MainLoop.scala
View File

@ -26,6 +26,11 @@ object MainLoop {
/** Entry point to run the remaining commands in State with managed global logging.*/
def runLogged(state: State): xsbti.MainResult = {
// This warns if ~/.coursier/cache is found.
// Temporary, remove when updating coursier to 2.0.0 final.
lmcoursier.CoursierConfiguration.checkLegacyCache()
// We've disabled jline shutdown hooks to prevent classloader leaks, and have been careful to always restore
// the jline terminal in finally blocks, but hitting ctrl+c prevents finally blocks from being executed, in that
// case the only way to restore the terminal is in a shutdown hook.

2
project/Dependencies.scala
View File

@ -76,7 +76,7 @@ object Dependencies {
def addSbtZincCompile = addSbtModule(sbtZincPath, "zincCompileJVM2_12", zincCompile)
def addSbtZincCompileCore = addSbtModule(sbtZincPath, "zincCompileCoreJVM2_12", zincCompileCore)
val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.0.0-RC6-2"
val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.0.0-RC6-4"
def sjsonNew(n: String) = Def.setting("com.eed3si9n" %% n % contrabandSjsonNewVersion.value)
val sjsonNewScalaJson = sjsonNew("sjson-new-scalajson")