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

Use the newly-added Resolution.metadataErrors instead of errors

This commit is contained in:
Alexandre Archambault 2017-03-27 16:23:29 +02:00
parent 44e3eee0d3
commit 8134809c99
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sbt-launcher/src/main/scala/coursier/sbtlauncher/Launcher.scala
View File

@ -174,8 +174,8 @@ class Launcher(
System.err.println(s"Resolved Scala $version (organization $scalaOrg)") System.err.println(s"Resolved Scala $version (organization $scalaOrg)")
} }
if (res.errors.nonEmpty) { if (res.metadataErrors.nonEmpty) {
Console.err.println(s"Errors:\n${res.errors.map(" " + _).mkString("\n")}") Console.err.println(s"Errors:\n${res.metadataErrors.map(" " + _).mkString("\n")}")
sys.exit(1) sys.exit(1)
} }
@ -328,8 +328,8 @@ class Launcher(
System.err.println(s"Resolved ${id0.groupID}:${id0.name}:${id0.version}$extraMsg") System.err.println(s"Resolved ${id0.groupID}:${id0.name}:${id0.version}$extraMsg")
} }
if (res.errors.nonEmpty) { if (res.metadataErrors.nonEmpty) {
Console.err.println(s"Errors:\n${res.errors.map(" " + _).mkString("\n")}") Console.err.println(s"Errors:\n${res.metadataErrors.map(" " + _).mkString("\n")}")
sys.exit(1) sys.exit(1)
} }
@ -463,8 +463,8 @@ class Launcher(
System.err.println(s"Resolved org.scala-sbt:interface:$sbtVersion") System.err.println(s"Resolved org.scala-sbt:interface:$sbtVersion")
} }
if (res.errors.nonEmpty) { if (res.metadataErrors.nonEmpty) {
Console.err.println(s"Errors:\n${res.errors.map(" " + _).mkString("\n")}") Console.err.println(s"Errors:\n${res.metadataErrors.map(" " + _).mkString("\n")}")
sys.exit(1) sys.exit(1)
} }
@ -582,8 +582,8 @@ class Launcher(
System.err.println(s"Resolved org.scala-sbt:compiler-interface:$sbtVersion") System.err.println(s"Resolved org.scala-sbt:compiler-interface:$sbtVersion")
} }
if (res.errors.nonEmpty) { if (res.metadataErrors.nonEmpty) {
Console.err.println(s"Errors:\n${res.errors.map(" " + _).mkString("\n")}") Console.err.println(s"Errors:\n${res.metadataErrors.map(" " + _).mkString("\n")}")
sys.exit(1) sys.exit(1)
} }

2
tests/jvm/src/test/scala/coursier/test/CacheFetchTests.scala
View File

@ -54,7 +54,7 @@ object CacheFetchTests extends TestSuite {
cleanTmpDir() cleanTmpDir()
} }
val errors = res.errors val errors = res.metadataErrors
assert(errors.isEmpty) assert(errors.isEmpty)
} }