From 2e6870d17ea3c6cbf45617ec57a43e9a7189c7e3 Mon Sep 17 00:00:00 2001
From: andrea <andrea.peruffo1982@gmail.com>
Date: Wed, 24 Oct 2018 11:49:51 +0100
Subject: [PATCH] minor cleanup and using missingOk instead of external
 property

---
 build.sbt                                             |  3 +--
 coursier/src/main/contraband/lm-coursier.json         |  6 ------
 .../coursier/CoursierDependencyResolution.scala       | 11 ++++++-----
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/build.sbt b/build.sbt
index 3d14abf85..d90d2d0b4 100644
--- a/build.sbt
+++ b/build.sbt
@@ -307,8 +307,7 @@ addCommandAlias("scriptedCoursier", Seq(
   "lmScriptedTest/clean",
   """set ThisBuild / scriptedTestLMImpl := "coursier"""",
   """set ThisBuild / scriptedLaunchOpts += "-Ddependency.resolution=coursier" """,
-  // excluding sbt-plugins test, artifacts are downloaded but sbt do not pick up the plugin
-  "lmScriptedTest/scripted lmScriptedTest/simple lmScriptedTest/with-trasnsitive").mkString(";",";",""))
+  "lmScriptedTest/scripted").mkString(";",";",""))
 
 def customCommands: Seq[Setting[_]] = Seq(
   commands += Command.command("release") { state =>
diff --git a/coursier/src/main/contraband/lm-coursier.json b/coursier/src/main/contraband/lm-coursier.json
index 6b8d69166..927175607 100644
--- a/coursier/src/main/contraband/lm-coursier.json
+++ b/coursier/src/main/contraband/lm-coursier.json
@@ -42,12 +42,6 @@
           "type": "Int",
           "default": "100",
           "since": "0.0.1"
-        },
-        {
-          "name": "ignoreArtifactErrors",
-          "type": "Boolean",
-          "default": "false",
-          "since": "0.0.1"
         }
       ]
     }
diff --git a/coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierDependencyResolution.scala b/coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierDependencyResolution.scala
index 7cec715b5..527ab4b8e 100644
--- a/coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierDependencyResolution.scala
+++ b/coursier/src/main/scala/sbt/librarymanagement/coursier/CoursierDependencyResolution.scala
@@ -18,8 +18,8 @@ case class CoursierModuleDescriptor(
     directDependencies: Vector[ModuleID],
     scalaModuleInfo: Option[ScalaModuleInfo],
     moduleSettings: ModuleSettings,
+    configurations: Seq[String],
     extraInputHash: Long,
-    configurations: Seq[String]
 ) extends ModuleDescriptor
 
 case class CoursierModuleSettings() extends ModuleSettings
@@ -100,8 +100,8 @@ private[sbt] class CoursierDependencyResolution(coursierConfiguration: CoursierC
       moduleSetting.dependencies,
       moduleSetting.scalaModuleInfo,
       CoursierModuleSettings(),
-      extraInputHash,
-      moduleSetting.configurations.map(_.name)
+      moduleSetting.configurations.map(_.name),
+      extraInputHash
     )
   }
 
@@ -138,6 +138,7 @@ private[sbt] class CoursierDependencyResolution(coursierConfiguration: CoursierC
     // not sure what DependencyResolutionInterface.moduleDescriptor is for, we're handled ivy stuff anyway...
     val module0 = module match {
       case c: CoursierModuleDescriptor => c
+      // This shouldn't happen at best of my understanding
       case i: IvySbt#Module =>
         moduleDescriptor(
           i.moduleSettings match {
@@ -198,7 +199,7 @@ private[sbt] class CoursierDependencyResolution(coursierConfiguration: CoursierC
           resolution.conflicts.isEmpty) {
         updateReport()
       } else if (resolution.isDone &&
-                 (!resolution.errors.isEmpty && coursierConfiguration.ignoreArtifactErrors)
+                 (!resolution.errors.isEmpty && configuration.missingOk)
                  && resolution.conflicts.isEmpty) {
         log.warn(s"""Failed to download artifacts: ${resolution.errors
           .map(_._2)
@@ -313,7 +314,7 @@ private[sbt] class CoursierDependencyResolution(coursierConfiguration: CoursierC
 
   // Key is the name of the configuration (i.e. `compile`) and the values are the name itself plus the
   // names of the configurations that this one depends on.
-  private def extractConfigurationTree: ConfigurationDependencyTree = {
+  private val extractConfigurationTree: ConfigurationDependencyTree = {
     (Configurations.default ++
       Configurations.defaultInternal ++
       Seq(ScalaTool, CompilerPlugin, Component))