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

Merge pull request #1807 from indrajitr/deprecated-annotation-fix 

Fix params order in `@deprecated`
This commit is contained in:
Josh Suereth 2015-01-19 08:10:15 -05:00
parent 4a909eb338 c967653442
commit af87e08d17
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ivy/src/main/scala/sbt/ConvertResolver.scala
View File

@ -97,7 +97,7 @@ private[sbt] object ConvertResolver {
} }
/** Converts the given sbt resolver into an Ivy resolver. */ /** 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 = def apply(r: Resolver, settings: IvySettings, log: Logger): DependencyResolver =
apply(r, settings, UpdateOptions(), log) apply(r, settings, UpdateOptions(), log)

8
ivy/src/main/scala/sbt/CustomPomParser.scala
View File

@ -14,7 +14,7 @@ import java.net.URL
import java.util.regex.Pattern import java.util.regex.Pattern
import sbt.mavenint.{ PomExtraDependencyAttributes, SbtPomExtraProperties } 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 { final class CustomPomParser(delegate: ModuleDescriptorParser, transform: (ModuleDescriptorParser, ModuleDescriptor) => ModuleDescriptor) extends ModuleDescriptorParser {
override def parseDescriptor(ivySettings: ParserSettings, descriptorURL: URL, validate: Boolean) = override def parseDescriptor(ivySettings: ParserSettings, descriptorURL: URL, validate: Boolean) =
transform(this, delegate.parseDescriptor(ivySettings, descriptorURL, validate)) 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 getType() = delegate.getType()
override def getMetadataArtifact(mrid: ModuleRevisionId, res: Resource) = delegate.getMetadataArtifact(mrid, res) 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 { object CustomPomParser {
// Evil hackery to override the default maven pom mappings. // Evil hackery to override the default maven pom mappings.
@ -65,7 +65,7 @@ object CustomPomParser {
{ {
val oldTransformedHashKey = "sbtTransformHash" val oldTransformedHashKey = "sbtTransformHash"
val extraInfo = md.getExtraInfo 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).isDefined &&
((Option(extraInfo get TransformedHashKey) orElse Option(extraInfo get oldTransformedHashKey)) match { ((Option(extraInfo get TransformedHashKey) orElse Option(extraInfo get oldTransformedHashKey)) match {
case Some(TransformHash) => true case Some(TransformHash) => true
@ -205,4 +205,4 @@ object CustomPomParser {
} }
dmd dmd
} }
} }