From 330134d5d926ac92d8ab007b6b1ba66c00f2fc7d Mon Sep 17 00:00:00 2001 From: Jentsch Date: Sun, 19 Mar 2017 14:50:27 +0100 Subject: [PATCH] Simplified handling of undefined settings (Also avoiding null) --- sbt-coursier/src/main/scala-2.10/coursier/Tasks.scala | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sbt-coursier/src/main/scala-2.10/coursier/Tasks.scala b/sbt-coursier/src/main/scala-2.10/coursier/Tasks.scala index 547fa8c70..8c6d7ea0c 100644 --- a/sbt-coursier/src/main/scala-2.10/coursier/Tasks.scala +++ b/sbt-coursier/src/main/scala-2.10/coursier/Tasks.scala @@ -167,7 +167,7 @@ object Tasks { } yield { val publish = publishArtifact.in(projectRef).in(pkgTask).in(config).getOrElse(state, false) if (publish) - Option(artifact.in(projectRef).in(pkgTask).in(config).getOrElse(state, null)) + artifact.in(projectRef).in(pkgTask).in(config).find(state) .map(targetConfig -> _) else None @@ -200,9 +200,7 @@ object Tasks { // Second-way of getting artifacts from SBT // No obvious way of getting the corresponding publishArtifact value for the ones // only here, it seems. - val extraSbtArtifacts = Option(artifacts.in(projectRef).getOrElse(state, null)) - .toSeq - .flatten + val extraSbtArtifacts = artifacts.in(projectRef).getOrElse(state, Nil) .filterNot(stdArtifactsSet) // Seems that SBT does that - if an artifact has no configs,