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

Simplified handling of undefined settings 

(Also avoiding null)
This commit is contained in:
Jentsch 2017-03-19 14:50:27 +01:00
parent 363a841f5a
commit 330134d5d9
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbt-coursier/src/main/scala-2.10/coursier/Tasks.scala
View File

@ -167,7 +167,7 @@ object Tasks {
} yield { } yield {
val publish = publishArtifact.in(projectRef).in(pkgTask).in(config).getOrElse(state, false) val publish = publishArtifact.in(projectRef).in(pkgTask).in(config).getOrElse(state, false)
if (publish) if (publish)
Option(artifact.in(projectRef).in(pkgTask).in(config).getOrElse(state, null)) artifact.in(projectRef).in(pkgTask).in(config).find(state)
.map(targetConfig -> _) .map(targetConfig -> _)
else else
None None
@ -200,9 +200,7 @@ object Tasks {
// Second-way of getting artifacts from SBT // Second-way of getting artifacts from SBT
// No obvious way of getting the corresponding publishArtifact value for the ones // No obvious way of getting the corresponding publishArtifact value for the ones
// only here, it seems. // only here, it seems.
val extraSbtArtifacts = Option(artifacts.in(projectRef).getOrElse(state, null)) val extraSbtArtifacts = artifacts.in(projectRef).getOrElse(state, Nil)
.toSeq
.flatten
.filterNot(stdArtifactsSet) .filterNot(stdArtifactsSet)
// Seems that SBT does that - if an artifact has no configs, // Seems that SBT does that - if an artifact has no configs,