From 310364ed9371f21a78fe7f985be7baa29987bdad Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Tue, 13 Jun 2017 14:24:48 +0200
Subject: [PATCH] Don't include optional artifacts by default

Except for classifiers artifacts, where they were already assumed to be
optional
---
 .../main/scala-2.11/coursier/cli/Helper.scala |  2 +-
 .../main/scala/coursier/core/Resolution.scala | 24 +++++++++++++------
 .../src/main/scala/coursier/Tasks.scala       |  2 +-
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/cli/src/main/scala-2.11/coursier/cli/Helper.scala b/cli/src/main/scala-2.11/coursier/cli/Helper.scala
index 5d083fdec..7d52cd5b0 100644
--- a/cli/src/main/scala-2.11/coursier/cli/Helper.scala
+++ b/cli/src/main/scala-2.11/coursier/cli/Helper.scala
@@ -621,7 +621,7 @@ class Helper(
 
         res0.dependencyClassifiersArtifacts(classifiers.toVector.sorted).map(_._2)
       } else
-        res0.dependencyArtifacts.map(_._2)
+        res0.dependencyArtifacts(withOptional = true).map(_._2)
 
     if (artifactTypes("*"))
       artifacts0
diff --git a/core/shared/src/main/scala/coursier/core/Resolution.scala b/core/shared/src/main/scala/coursier/core/Resolution.scala
index 9fc848f68..7530e6b3c 100644
--- a/core/shared/src/main/scala/coursier/core/Resolution.scala
+++ b/core/shared/src/main/scala/coursier/core/Resolution.scala
@@ -1017,9 +1017,10 @@ final case class Resolution(
 
   private def artifacts0(
     overrideClassifiers: Option[Seq[String]],
-    keepAttributes: Boolean
+    keepAttributes: Boolean,
+    optional: Boolean
   ): Seq[Artifact] =
-    dependencyArtifacts0(overrideClassifiers).map {
+    dependencyArtifacts0(overrideClassifiers, optional).map {
       case (_, artifact) =>
         if (keepAttributes) artifact else artifact.copy(attributes = Attributes("", ""))
     }.distinct
@@ -1028,12 +1029,18 @@ final case class Resolution(
   // if one wants the attributes field of artifacts not to be cleared, call dependencyArtifacts
 
   def classifiersArtifacts(classifiers: Seq[String]): Seq[Artifact] =
-    artifacts0(Some(classifiers), keepAttributes = false)
+    artifacts0(Some(classifiers), keepAttributes = false, optional = true)
 
   def artifacts: Seq[Artifact] =
-    artifacts0(None, keepAttributes = false)
+    artifacts0(None, keepAttributes = false, optional = false)
 
-  private def dependencyArtifacts0(overrideClassifiers: Option[Seq[String]]): Seq[(Dependency, Artifact)] =
+  def artifacts(withOptional: Boolean): Seq[Artifact] =
+    artifacts0(None, keepAttributes = false, optional = withOptional)
+
+  private def dependencyArtifacts0(
+    overrideClassifiers: Option[Seq[String]],
+    optional: Boolean
+  ): Seq[(Dependency, Artifact)] =
     for {
       dep <- minDependencies.toSeq
       (source, proj) <- projectCache
@@ -1044,10 +1051,13 @@ final case class Resolution(
     } yield dep -> artifact
 
   def dependencyArtifacts: Seq[(Dependency, Artifact)] =
-    dependencyArtifacts0(None)
+    dependencyArtifacts0(None, optional = false)
+
+  def dependencyArtifacts(withOptional: Boolean): Seq[(Dependency, Artifact)] =
+    dependencyArtifacts0(None, optional = withOptional)
 
   def dependencyClassifiersArtifacts(classifiers: Seq[String]): Seq[(Dependency, Artifact)] =
-    dependencyArtifacts0(Some(classifiers))
+    dependencyArtifacts0(Some(classifiers), optional = true)
 
   /**
     * Returns errors on dependencies
diff --git a/sbt-coursier/src/main/scala/coursier/Tasks.scala b/sbt-coursier/src/main/scala/coursier/Tasks.scala
index 591dad1f1..70c7e6b78 100644
--- a/sbt-coursier/src/main/scala/coursier/Tasks.scala
+++ b/sbt-coursier/src/main/scala/coursier/Tasks.scala
@@ -881,7 +881,7 @@ object Tasks {
 
       val allArtifacts0 =
         classifiers match {
-          case None => res.flatMap(_.artifacts)
+          case None => res.flatMap(_.artifacts(withOptional = true))
           case Some(cl) => res.flatMap(_.classifiersArtifacts(cl))
         }