mirror of https://github.com/sbt/sbt.git
Merge pull request #474 from coursier/topic/fix-warnings
Fix some warnings
This commit is contained in:
commit
96b188b9a9
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue