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

Merge pull request #6184 from jtjeferreira/backport_coursier_2.0.7 

[1.4.x] backport #6120 Updates to Coursier 2.0.7
This commit is contained in:
eugene yokota 2020-11-30 20:31:24 -05:00 committed by GitHub
parent 1a1cca3cd3 936a643c5b
commit 75184cae67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main/src/main/scala/sbt/coursierint/CoursierRepositoriesTasks.scala
View File

@ -11,7 +11,6 @@ package coursierint
import sbt.librarymanagement._ import sbt.librarymanagement._
import sbt.Keys._ import sbt.Keys._
import sbt.ScopeFilter.Make._ import sbt.ScopeFilter.Make._
import sbt.io.IO
object CoursierRepositoriesTasks { object CoursierRepositoriesTasks {
private object CResolvers { private object CResolvers {
@ -76,7 +75,7 @@ object CoursierRepositoriesTasks {
val result2 = val result2 =
paths.ivyHome match { paths.ivyHome match {
case Some(ivyHome) => case Some(ivyHome) =>
val ivyHomeUri = IO.toURI(ivyHome).getSchemeSpecificPart val ivyHomeUri = ivyHome.getPath
result1 map { result1 map {
case r: FileRepository => case r: FileRepository =>
val ivyPatterns = r.patterns.ivyPatterns map { val ivyPatterns = r.patterns.ivyPatterns map {

2
project/Dependencies.scala
View File

@ -77,7 +77,7 @@ object Dependencies {
def addSbtZincCompile = addSbtModule(sbtZincPath, "zincCompileJVM2_12", zincCompile) def addSbtZincCompile = addSbtModule(sbtZincPath, "zincCompileJVM2_12", zincCompile)
def addSbtZincCompileCore = addSbtModule(sbtZincPath, "zincCompileCoreJVM2_12", zincCompileCore) def addSbtZincCompileCore = addSbtModule(sbtZincPath, "zincCompileCoreJVM2_12", zincCompileCore)
val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.0.3" val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.0.4"
def sjsonNew(n: String) = def sjsonNew(n: String) =
Def.setting("com.eed3si9n" %% n % "0.9.1") // contrabandSjsonNewVersion.value Def.setting("com.eed3si9n" %% n % "0.9.1") // contrabandSjsonNewVersion.value