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

Merge pull request #5917 from eed3si9n/wip/bumpcoursier 

lm-coursier-shaded 2.0.0
This commit is contained in:
eugene yokota 2020-10-03 10:35:17 -04:00 committed by GitHub
parent aa91a1b304 6662b2cf99
commit 89ad0db0a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/src/main/scala/sbt/coursierint/LMCoursier.scala
View File

@ -37,17 +37,10 @@ object LMCoursier {
private[this] val credentialRegistry: ConcurrentHashMap[(String, String), IvyCredentials] =
new ConcurrentHashMap
private[this] lazy val checkLegacyCache: Unit = {
// This warns if ~/.coursier/cache is found.
// Temporary, remove when updating coursier to 2.0.0 final.
lmcoursier.CoursierConfiguration.checkLegacyCache()
}
def defaultCacheLocation: File =
sys.props.get("sbt.coursier.home") match {
case Some(home) => new File(home).getAbsoluteFile / "cache"
case _ =>
checkLegacyCache
CoursierDependencyResolution.defaultCacheLocation
}

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-9"
val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.0.0"
def sjsonNew(n: String) =
Def.setting("com.eed3si9n" %% n % "0.9.0") // contrabandSjsonNewVersion.value