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

Move deprecated scala-tools conveniences to private[sbt] accessibility

This commit is contained in:
Mark Harrah 2013-06-19 17:13:32 -04:00
parent 464f093017
commit 7796715e88
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ivy/src/main/scala/sbt/Resolver.scala
View File

@ -135,10 +135,7 @@ final case class SftpRepository(name: String, connection: SshConnection, pattern
}
import Resolver._
@deprecated("Maven repository at scala-tools.org is being phased out, consider using an alternative resolver", "0.11.3")
object ScalaToolsReleases extends MavenRepository(ScalaToolsReleasesName, ScalaToolsReleasesRoot)
@deprecated("Maven repository at scala-tools.org is being phased out, consider using an alternative resolver", "0.11.3")
object ScalaToolsSnapshots extends MavenRepository(ScalaToolsSnapshotsName, ScalaToolsSnapshotsRoot)
object DefaultMavenRepository extends MavenRepository("public", IBiblioResolver.DEFAULT_M2_ROOT)
object JavaNet2Repository extends MavenRepository(JavaNet2RepositoryName, JavaNet2RepositoryRoot)
object JavaNet1Repository extends JavaNet1Repository
@ -152,14 +149,15 @@ object Resolver
val TypesafeRepositoryRoot = "http://repo.typesafe.com/typesafe"
val SbtPluginRepositoryRoot = "http://scalasbt.artifactoryonline.com/scalasbt"
val SonatypeRepositoryRoot = "https://oss.sonatype.org/content/repositories"
@deprecated("Maven repository at scala-tools.org is being phased out, consider using an alternative resolver", "0.11.3")
val ScalaToolsReleasesName = "Sonatype OSS Releases"
@deprecated("Maven repository at scala-tools.org is being phased out, consider using an alternative resolver", "0.11.3")
val ScalaToolsSnapshotsName = "Sonatype OSS Snapshots"
@deprecated("Maven repository at scala-tools.org is being phased out, consider using an alternative resolver", "0.11.3")
val ScalaToolsReleasesRoot = SonatypeRepositoryRoot + "/releases"
@deprecated("Maven repository at scala-tools.org is being phased out, consider using an alternative resolver", "0.11.3")
val ScalaToolsSnapshotsRoot = SonatypeRepositoryRoot + "/snapshots"
// obsolete: kept only for launcher compatibility
private[sbt] val ScalaToolsReleasesName = "Sonatype OSS Releases"
private[sbt] val ScalaToolsSnapshotsName = "Sonatype OSS Snapshots"
private[sbt] val ScalaToolsReleasesRoot = SonatypeRepositoryRoot + "/releases"
private[sbt] val ScalaToolsSnapshotsRoot = SonatypeRepositoryRoot + "/snapshots"
private[sbt] val ScalaToolsReleases = new MavenRepository(ScalaToolsReleasesName, ScalaToolsReleasesRoot)
private[sbt] val ScalaToolsSnapshots = new MavenRepository(ScalaToolsSnapshotsName, ScalaToolsSnapshotsRoot)
val JavaNet2RepositoryName = "java.net Maven2 Repository"
val JavaNet2RepositoryRoot = "http://download.java.net/maven/2"

4
main/src/main/scala/sbt/Defaults.scala
View File

@ -1457,8 +1457,8 @@ object Classpaths
case Predefined.Local => Resolver.defaultLocal
case Predefined.MavenLocal => Resolver.mavenLocal
case Predefined.MavenCentral => DefaultMavenRepository
case Predefined.ScalaToolsReleases => ScalaToolsReleases
case Predefined.ScalaToolsSnapshots => ScalaToolsSnapshots
case Predefined.ScalaToolsReleases => Resolver.ScalaToolsReleases
case Predefined.ScalaToolsSnapshots => Resolver.ScalaToolsSnapshots
case Predefined.SonatypeOSSReleases => Resolver.sonatypeRepo("releases")
case Predefined.SonatypeOSSSnapshots => Resolver.sonatypeRepo("snapshots")
case unknown => error("Unknown predefined resolver '" + unknown + "'. This resolver may only be supported in newer sbt versions.")