From c967653442e4def25fdcd89477131ed83927bd91 Mon Sep 17 00:00:00 2001 From: Indrajit Raychaudhuri Date: Sat, 17 Jan 2015 08:25:57 +0530 Subject: [PATCH] Fix params order in `@deprecated` --- ivy/src/main/scala/sbt/ConvertResolver.scala | 2 +- ivy/src/main/scala/sbt/CustomPomParser.scala | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ivy/src/main/scala/sbt/ConvertResolver.scala b/ivy/src/main/scala/sbt/ConvertResolver.scala index 26abec09c..3771266aa 100644 --- a/ivy/src/main/scala/sbt/ConvertResolver.scala +++ b/ivy/src/main/scala/sbt/ConvertResolver.scala @@ -97,7 +97,7 @@ private[sbt] object ConvertResolver { } /** Converts the given sbt resolver into an Ivy resolver. */ - @deprecated("0.13.8", "Use the variant with updateOptions") + @deprecated("Use the variant with updateOptions", "0.13.8") def apply(r: Resolver, settings: IvySettings, log: Logger): DependencyResolver = apply(r, settings, UpdateOptions(), log) diff --git a/ivy/src/main/scala/sbt/CustomPomParser.scala b/ivy/src/main/scala/sbt/CustomPomParser.scala index d9ceff32a..7b5664daf 100644 --- a/ivy/src/main/scala/sbt/CustomPomParser.scala +++ b/ivy/src/main/scala/sbt/CustomPomParser.scala @@ -14,7 +14,7 @@ import java.net.URL import java.util.regex.Pattern import sbt.mavenint.{ PomExtraDependencyAttributes, SbtPomExtraProperties } -@deprecated("0.13.8", "We now use an Aether-based pom parser.") +@deprecated("We now use an Aether-based pom parser.", "0.13.8") final class CustomPomParser(delegate: ModuleDescriptorParser, transform: (ModuleDescriptorParser, ModuleDescriptor) => ModuleDescriptor) extends ModuleDescriptorParser { override def parseDescriptor(ivySettings: ParserSettings, descriptorURL: URL, validate: Boolean) = transform(this, delegate.parseDescriptor(ivySettings, descriptorURL, validate)) @@ -28,7 +28,7 @@ final class CustomPomParser(delegate: ModuleDescriptorParser, transform: (Module override def getType() = delegate.getType() override def getMetadataArtifact(mrid: ModuleRevisionId, res: Resource) = delegate.getMetadataArtifact(mrid, res) } -@deprecated("0.13.8", "We now use an Aether-based pom parser.") +@deprecated("We now use an Aether-based pom parser.", "0.13.8") object CustomPomParser { // Evil hackery to override the default maven pom mappings. @@ -65,7 +65,7 @@ object CustomPomParser { { val oldTransformedHashKey = "sbtTransformHash" val extraInfo = md.getExtraInfo - // sbt 0.13.1 used "sbtTransformHash" instead of "e:sbtTransformHash" until #1192 so read both + // sbt 0.13.1 used "sbtTransformHash" instead of "e:sbtTransformHash" until #1192 so read both Option(extraInfo).isDefined && ((Option(extraInfo get TransformedHashKey) orElse Option(extraInfo get oldTransformedHashKey)) match { case Some(TransformHash) => true @@ -205,4 +205,4 @@ object CustomPomParser { } dmd } -} \ No newline at end of file +}