From 81d7edb6c65bf6a907dfa894cf4d16d77cfaebfc Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Wed, 29 May 2019 23:48:05 -0400 Subject: [PATCH] lm-coursier-shaded 1.1.0-M14-3 Fixes #4738 --- .../librarymanagement/CoursierInputsTasks.scala | 12 +++++------- .../sbt/internal/librarymanagement/IvyXml.scala | 10 ++++------ project/Dependencies.scala | 2 +- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/main/src/main/scala/sbt/internal/librarymanagement/CoursierInputsTasks.scala b/main/src/main/scala/sbt/internal/librarymanagement/CoursierInputsTasks.scala index b8906840f..b837b737d 100644 --- a/main/src/main/scala/sbt/internal/librarymanagement/CoursierInputsTasks.scala +++ b/main/src/main/scala/sbt/internal/librarymanagement/CoursierInputsTasks.scala @@ -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 } } diff --git a/main/src/main/scala/sbt/internal/librarymanagement/IvyXml.scala b/main/src/main/scala/sbt/internal/librarymanagement/IvyXml.scala index c76992aff..9934d485c 100644 --- a/main/src/main/scala/sbt/internal/librarymanagement/IvyXml.scala +++ b/main/src/main/scala/sbt/internal/librarymanagement/IvyXml.scala @@ -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, diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ec8ed92b1..9c5f0a5fb 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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 {