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

Merge pull request #7920 from eed3si9n/wip/bump-coursier 

lm-coursier 2.1.6
This commit is contained in:
eugene yokota 2024-11-29 21:48:55 -05:00 committed by GitHub
parent 1e5827ee5a 57d134829b
commit b7e03605cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project/Dependencies.scala
View File

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

12
sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/build.sbt
View File

@ -9,6 +9,18 @@ TaskKey[Unit]("check") := {
val report = updateFull.value val report = updateFull.value
val graph = (Test / dependencyTree / asString).value val graph = (Test / dependencyTree / asString).value
def sanitize(str: String): String = str.split('\n').drop(1).map(_.trim).mkString("\n") def sanitize(str: String): String = str.split('\n').drop(1).map(_.trim).mkString("\n")
/*
Started to return:
ch.qos.logback:logback-core:1.0.7
default:sbt_8ae1da13_2.12:0.1.0-SNAPSHOT [S]
+-ch.qos.logback:logback-classic:1.0.7
| +-org.slf4j:slf4j-api:1.6.6 (evicted by: 1.7.2)
|
+-org.slf4j:slf4j-api:1.7.2
*/
val expectedGraph = val expectedGraph =
"""default:default-e95e05_2.12:0.1-SNAPSHOT [S] """default:default-e95e05_2.12:0.1-SNAPSHOT [S]
| +-ch.qos.logback:logback-classic:1.0.7 | +-ch.qos.logback:logback-classic:1.0.7

0
sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/test → sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/pending
View File