diff --git a/ivy/src/main/scala/sbt/Credentials.scala b/ivy/src/main/scala/sbt/Credentials.scala index fd6a85538..464d5de8e 100644 --- a/ivy/src/main/scala/sbt/Credentials.scala +++ b/ivy/src/main/scala/sbt/Credentials.scala @@ -27,7 +27,7 @@ object Credentials { def toDirect(c: Credentials): DirectCredentials = c match { case dc: DirectCredentials => dc case fc: FileCredentials => loadCredentials(fc.path) match { - case Left(err) => error(err) + case Left(err) => sys.error(err) case Right(dc) => dc } } diff --git a/ivy/src/main/scala/sbt/EvictionWarning.scala b/ivy/src/main/scala/sbt/EvictionWarning.scala index c40860081..25ad9014b 100644 --- a/ivy/src/main/scala/sbt/EvictionWarning.scala +++ b/ivy/src/main/scala/sbt/EvictionWarning.scala @@ -155,7 +155,7 @@ object EvictionWarning { val transitiveEvictions: mutable.ListBuffer[EvictionPair] = mutable.ListBuffer() def guessCompatible(p: EvictionPair): Boolean = p.evicteds forall { r => - options.guessCompatible(r.module, p.winner map { _.module }, module.moduleSettings.ivyScala) + options.guessCompatible((r.module, p.winner map { _.module }, module.moduleSettings.ivyScala)) } pairs foreach { case p if isScalaArtifact(module, p.organization, p.name) => diff --git a/ivy/src/main/scala/sbt/IvyActions.scala b/ivy/src/main/scala/sbt/IvyActions.scala index f5e57336d..c1e8bccf4 100644 --- a/ivy/src/main/scala/sbt/IvyActions.scala +++ b/ivy/src/main/scala/sbt/IvyActions.scala @@ -313,7 +313,7 @@ object IvyActions { private[this] def checkFilesPresent(artifacts: Seq[(IArtifact, File)]) { val missing = artifacts filter { case (a, file) => !file.exists } if (missing.nonEmpty) - error("Missing files for publishing:\n\t" + missing.map(_._2.getAbsolutePath).mkString("\n\t")) + sys.error("Missing files for publishing:\n\t" + missing.map(_._2.getAbsolutePath).mkString("\n\t")) } } final class ResolveException( diff --git a/ivy/src/main/scala/sbt/UpdateReport.scala b/ivy/src/main/scala/sbt/UpdateReport.scala index 443c84ed3..dbd913620 100644 --- a/ivy/src/main/scala/sbt/UpdateReport.scala +++ b/ivy/src/main/scala/sbt/UpdateReport.scala @@ -220,7 +220,7 @@ object UpdateReport { private[this] def select0(f: DependencyFilter): Seq[File] = for (cReport <- report.configurations; mReport <- cReport.modules; (artifact, file) <- mReport.artifacts if f(cReport.configuration, mReport.module, artifact)) yield { - if (file == null) error("Null file: conf=" + cReport.configuration + ", module=" + mReport.module + ", art: " + artifact) + if (file == null) sys.error("Null file: conf=" + cReport.configuration + ", module=" + mReport.module + ", art: " + artifact) file }