lm-coursier-shaded 1.1.0-M14-3

Fixes #4738
This commit is contained in:
Eugene Yokota 2019-05-29 23:48:05 -04:00
parent 0994b7c104
commit 81d7edb6c6
3 changed files with 10 additions and 14 deletions

View File

@ -58,16 +58,14 @@ private[sbt] object CoursierInputsTasks {
sv,
sbv
)
val proj1 = proj0.copy(
dependencies = proj0.dependencies.map {
case (config, dep) =>
(config, dep.copy(exclusions = dep.exclusions ++ exclusions0))
}
)
val proj1 = proj0.withDependencies(proj0.dependencies.map {
case (config, dep) =>
(config, dep.withExclusions(dep.exclusions ++ exclusions0))
})
auOpt match {
case Some(au) =>
val props = proj1.properties :+ ("info.apiURL" -> au.toString)
proj1.copy(properties = props)
proj1.withProperties(props)
case _ => proj1
}
}

View File

@ -85,11 +85,9 @@ object IvyXml {
.collect { case (conf, dep) if conf.value == shadedConfig.value => dep }
}
val project: Project = project0.copy(
dependencies = project0.dependencies.collect {
case p @ (_, dep) if !filterOutDependencies(dep) => p
}
)
val project: Project = project0.withDependencies(project0.dependencies.collect {
case p @ (_, dep) if !filterOutDependencies(dep) => p
})
val infoAttrs =
(project.module.attributes.toSeq ++ project.properties).foldLeft[xml.MetaData](xml.Null) {
@ -186,7 +184,7 @@ object IvyXml {
val currentProject = {
val proj = csrProject.value
val publications = csrPublications.value
proj.copy(publications = publications)
proj.withPublications(publications)
}
IvyXml.writeFiles(
currentProject,

View File

@ -112,7 +112,7 @@ object Dependencies {
def addSbtZincCompileCore(p: Project): Project =
addSbtModule(p, sbtZincPath, "zincCompileCore", zincCompileCore)
val lmCoursierVersion = "1.1.0-M14-3"
val lmCoursierVersion = "1.1.0-M14-4"
val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % lmCoursierVersion
val sjsonNewScalaJson = Def.setting {