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

lm-coursier-shaded 2.0.0-RC6-8 

https://github.com/coursier/sbt-coursier/releases/tag/v2.0.0-RC6-5
https://github.com/coursier/sbt-coursier/releases/tag/v2.0.0-RC6-6
https://github.com/coursier/sbt-coursier/releases/tag/v2.0.0-RC6-7
https://github.com/coursier/sbt-coursier/releases/tag/v2.0.0-RC6-8

Ref https://github.com/coursier/sbt-coursier/pull/235
Ref https://github.com/coursier/sbt-coursier/pull/262
This commit is contained in:
Eugene Yokota 2020-05-28 01:00:46 -04:00
parent e66282433a
commit 2bebee4dfe
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
main/src/main/scala/sbt/coursierint/CoursierInputsTasks.scala
View File

@ -40,7 +40,6 @@ object CoursierInputsTasks {
private def coursierProject0( private def coursierProject0(
projId: ModuleID, projId: ModuleID,
dependencies: Seq[ModuleID], dependencies: Seq[ModuleID],
excludeDeps: Seq[InclExclRule],
configurations: Seq[sbt.librarymanagement.Configuration], configurations: Seq[sbt.librarymanagement.Configuration],
sv: String, sv: String,
sbv: String, sbv: String,
@ -50,9 +49,7 @@ object CoursierInputsTasks {
log: Logger log: Logger
): CProject = { ): CProject = {
val exclusions0 = Inputs.exclusions(excludeDeps, sv, sbv, log) val configMap = Inputs.configExtendsSeq(configurations).toMap
val configMap = Inputs.configExtends(configurations)
val proj0 = FromSbt.project( val proj0 = FromSbt.project(
projId, projId,
@ -61,18 +58,14 @@ object CoursierInputsTasks {
sv, sv,
sbv sbv
) )
val proj1 = proj0.withDependencies(proj0.dependencies.map { val proj1 = auOpt match {
case (config, dep) =>
(config, dep.withExclusions(dep.exclusions ++ exclusions0))
})
val proj2 = auOpt match {
case Some(au) => case Some(au) =>
val props = proj1.properties :+ ("info.apiURL" -> au.toString) val props = proj0.properties :+ ("info.apiURL" -> au.toString)
proj1.withProperties(props) proj0.withProperties(props)
case _ => proj1 case _ => proj0
} }
proj2.withInfo( proj1.withInfo(
proj2.info.withDescription(description).withHomePage(homepage.fold("")(_.toString)) proj1.info.withDescription(description).withHomePage(homepage.fold("")(_.toString))
) )
} }
@ -81,7 +74,6 @@ object CoursierInputsTasks {
coursierProject0( coursierProject0(
projectID.value, projectID.value,
allDependencies.value, allDependencies.value,
allExcludeDependencies.value,
ivyConfigurations.value, ivyConfigurations.value,
scalaVersion.value, scalaVersion.value,
scalaBinaryVersion.value, scalaBinaryVersion.value,

2
project/Dependencies.scala
View File

@ -76,7 +76,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.0-RC6-4" val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.0.0-RC6-8"
def sjsonNew(n: String) = def sjsonNew(n: String) =
Def.setting("com.eed3si9n" %% n % "0.9.0") // contrabandSjsonNewVersion.value Def.setting("com.eed3si9n" %% n % "0.9.0") // contrabandSjsonNewVersion.value