From 8134809c99e7fd190776cb4a02623cdf330aa7ed Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 27 Mar 2017 16:23:29 +0200 Subject: [PATCH] Use the newly-added Resolution.metadataErrors instead of errors --- .../scala/coursier/sbtlauncher/Launcher.scala | 16 ++++++++-------- .../scala/coursier/test/CacheFetchTests.scala | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sbt-launcher/src/main/scala/coursier/sbtlauncher/Launcher.scala b/sbt-launcher/src/main/scala/coursier/sbtlauncher/Launcher.scala index d591a9dd8..cf10cb315 100644 --- a/sbt-launcher/src/main/scala/coursier/sbtlauncher/Launcher.scala +++ b/sbt-launcher/src/main/scala/coursier/sbtlauncher/Launcher.scala @@ -174,8 +174,8 @@ class Launcher( System.err.println(s"Resolved Scala $version (organization $scalaOrg)") } - if (res.errors.nonEmpty) { - Console.err.println(s"Errors:\n${res.errors.map(" " + _).mkString("\n")}") + if (res.metadataErrors.nonEmpty) { + Console.err.println(s"Errors:\n${res.metadataErrors.map(" " + _).mkString("\n")}") sys.exit(1) } @@ -328,8 +328,8 @@ class Launcher( System.err.println(s"Resolved ${id0.groupID}:${id0.name}:${id0.version}$extraMsg") } - if (res.errors.nonEmpty) { - Console.err.println(s"Errors:\n${res.errors.map(" " + _).mkString("\n")}") + if (res.metadataErrors.nonEmpty) { + Console.err.println(s"Errors:\n${res.metadataErrors.map(" " + _).mkString("\n")}") sys.exit(1) } @@ -463,8 +463,8 @@ class Launcher( System.err.println(s"Resolved org.scala-sbt:interface:$sbtVersion") } - if (res.errors.nonEmpty) { - Console.err.println(s"Errors:\n${res.errors.map(" " + _).mkString("\n")}") + if (res.metadataErrors.nonEmpty) { + Console.err.println(s"Errors:\n${res.metadataErrors.map(" " + _).mkString("\n")}") sys.exit(1) } @@ -582,8 +582,8 @@ class Launcher( System.err.println(s"Resolved org.scala-sbt:compiler-interface:$sbtVersion") } - if (res.errors.nonEmpty) { - Console.err.println(s"Errors:\n${res.errors.map(" " + _).mkString("\n")}") + if (res.metadataErrors.nonEmpty) { + Console.err.println(s"Errors:\n${res.metadataErrors.map(" " + _).mkString("\n")}") sys.exit(1) } diff --git a/tests/jvm/src/test/scala/coursier/test/CacheFetchTests.scala b/tests/jvm/src/test/scala/coursier/test/CacheFetchTests.scala index 2408842a4..bc06df92d 100644 --- a/tests/jvm/src/test/scala/coursier/test/CacheFetchTests.scala +++ b/tests/jvm/src/test/scala/coursier/test/CacheFetchTests.scala @@ -54,7 +54,7 @@ object CacheFetchTests extends TestSuite { cleanTmpDir() } - val errors = res.errors + val errors = res.metadataErrors assert(errors.isEmpty) }