diff --git a/cache/src/main/scala/coursier/Cache.scala b/cache/src/main/scala/coursier/Cache.scala index e98ce2de8..dc1349ae9 100644 --- a/cache/src/main/scala/coursier/Cache.scala +++ b/cache/src/main/scala/coursier/Cache.scala @@ -1024,7 +1024,7 @@ object Cache { def downloadingArtifact(url: String, file: File): Unit = {} - @deprecated("Use / override the variant with 3 arguments instead") + @deprecated("Use / override the variant with 3 arguments instead", "1.0.0-M10") def downloadLength(url: String, length: Long): Unit = {} def downloadLength(url: String, totalLength: Long, alreadyDownloaded: Long): Unit = { downloadLength(url, totalLength) diff --git a/core/shared/src/main/scala/coursier/core/Resolution.scala b/core/shared/src/main/scala/coursier/core/Resolution.scala index 840806e2f..511d7c8e2 100644 --- a/core/shared/src/main/scala/coursier/core/Resolution.scala +++ b/core/shared/src/main/scala/coursier/core/Resolution.scala @@ -1049,7 +1049,7 @@ final case class Resolution( * Returns errors on dependencies, but that don't have POM-related errors * @return errors */ - @deprecated("use metadataErrors instead") + @deprecated("use metadataErrors instead", "1.0.0-RC1") def errors: Seq[(Dependency, Seq[String])] = for { dep <- dependencies.toSeq diff --git a/core/shared/src/main/scala/coursier/util/Parse.scala b/core/shared/src/main/scala/coursier/util/Parse.scala index dd2bb7435..0a8f20117 100644 --- a/core/shared/src/main/scala/coursier/util/Parse.scala +++ b/core/shared/src/main/scala/coursier/util/Parse.scala @@ -13,7 +13,7 @@ object Parse { private def defaultScalaVersion = scala.util.Properties.versionNumberString - @deprecated("use the variant accepting a default scala version") + @deprecated("use the variant accepting a default scala version", "1.0.0-M13") def module(s: String): Either[String, Module] = module(s, defaultScalaVersion) @@ -71,7 +71,7 @@ object Parse { (errors, values) } - @deprecated("use the variant accepting a default scala version") + @deprecated("use the variant accepting a default scala version", "1.0.0-M13") def modules(l: Seq[String]): (Seq[String], Seq[Module]) = modules(l, defaultScalaVersion) @@ -83,7 +83,7 @@ object Parse { def modules(l: Seq[String], defaultScalaVersion: String): (Seq[String], Seq[Module]) = valuesAndErrors(module(_, defaultScalaVersion), l) - @deprecated("use the variant accepting a default scala version") + @deprecated("use the variant accepting a default scala version", "1.0.0-M13") def moduleVersion(s: String): Either[String, (Module, String)] = moduleVersion(s, defaultScalaVersion) @@ -113,7 +113,7 @@ object Parse { } } - @deprecated("use the variant accepting a default scala version") + @deprecated("use the variant accepting a default scala version", "1.0.0-M13") def moduleVersionConfig(s: String): Either[String, (Module, String, Option[String])] = moduleVersionConfig(s, defaultScalaVersion) @@ -157,7 +157,7 @@ object Parse { } } - @deprecated("use the variant accepting a default scala version") + @deprecated("use the variant accepting a default scala version", "1.0.0-M13") def moduleVersions(l: Seq[String]): (Seq[String], Seq[(Module, String)]) = moduleVersions(l, defaultScalaVersion) @@ -169,7 +169,7 @@ object Parse { def moduleVersions(l: Seq[String], defaultScalaVersion: String): (Seq[String], Seq[(Module, String)]) = valuesAndErrors(moduleVersion(_, defaultScalaVersion), l) - @deprecated("use the variant accepting a default scala version") + @deprecated("use the variant accepting a default scala version", "1.0.0-M13") def moduleVersionConfigs(l: Seq[String]): (Seq[String], Seq[(Module, String, Option[String])]) = moduleVersionConfigs(l, defaultScalaVersion) 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 b38b97a37..bc06df92d 100644 --- a/tests/jvm/src/test/scala/coursier/test/CacheFetchTests.scala +++ b/tests/jvm/src/test/scala/coursier/test/CacheFetchTests.scala @@ -49,12 +49,12 @@ object CacheFetchTests extends TestSuite { ) ) - startRes.process.run(fetch).run + startRes.process.run(fetch).unsafePerformSync } finally { cleanTmpDir() } - val errors = res.errors + val errors = res.metadataErrors assert(errors.isEmpty) }