Use non soon-to-be-deprecated-or-reworked method

This commit is contained in:
Alexandre Archambault 2017-07-15 17:19:11 +02:00
parent fc0a1ccec7
commit 19493a512a
3 changed files with 4 additions and 3 deletions

View File

@ -122,7 +122,7 @@ object ToSbt {
) = {
val depArtifacts1 =
classifiersOpt match {
case None => res.dependencyArtifacts
case None => res.dependencyArtifacts(withOptional = true)
case Some(cl) => res.dependencyClassifiersArtifacts(cl)
}

View File

@ -91,7 +91,8 @@ object Shading {
)
}
val dependencyArtifacts = res.dependencyArtifacts
val dependencyArtifacts = res
.dependencyArtifacts(withOptional = true)
.filter { case (_, a) => classpathTypes(a.`type`) }
.groupBy(_._1)
.mapValues(_.map(_._2))

View File

@ -46,7 +46,7 @@ object IvyLocalTests extends TestSuite {
extraRepos = extraRepos
))
val artifacts = res.dependencyArtifacts.filter(_._2.`type` == "jar").map(_._2.url)
val artifacts = res.dependencyArtifacts(withOptional = true).filter(_._2.`type` == "jar").map(_._2.url)
val anyJavadoc = artifacts.exists(_.contains("-javadoc"))
val anySources = artifacts.exists(_.contains("-sources"))