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

Update Resolver configuration 

- deprecate scala-tools resolvers
- rename `typesafeResolver` to `typesafeReleases` for consistency
- add reference for other wel known resolvers, viz., oss.sonatype.org and scalasbt.artifactoryonline.com
- rearrange locations for helper methods
This commit is contained in:
Indrajit Raychaudhuri 2012-03-12 04:34:45 +05:30
parent d93b522ec7
commit 5b3dc5bf26
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ivy/IvyInterface.scala
View File

@ -178,7 +178,9 @@ 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.12.0")
object ScalaToolsReleases extends MavenRepository(ScalaToolsReleasesName, ScalaToolsReleasesRoot)
@deprecated("Maven repository at scala-tools.org is being phased out, consider using an alternative resolver", "0.12.0")
object ScalaToolsSnapshots extends MavenRepository(ScalaToolsSnapshotsName, ScalaToolsSnapshotsRoot)
object DefaultMavenRepository extends MavenRepository("public", IBiblioResolver.DEFAULT_M2_ROOT)
object JavaNet2Repository extends MavenRepository(JavaNet2RepositoryName, JavaNet2RepositoryRoot)
@ -190,13 +192,25 @@ sealed trait JavaNet1Repository extends Resolver
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.12.0")
val ScalaToolsReleasesName = "Scala-Tools Maven2 Repository"
@deprecated("Maven repository at scala-tools.org is being phased out, consider using an alternative resolver", "0.12.0")
val ScalaToolsSnapshotsName = "Scala-Tools Maven2 Snapshots Repository"
@deprecated("Maven repository at scala-tools.org is being phased out, consider using an alternative resolver", "0.12.0")
val ScalaToolsReleasesRoot = "http://scala-tools.org/repo-releases"
@deprecated("Maven repository at scala-tools.org is being phased out, consider using an alternative resolver", "0.12.0")
val ScalaToolsSnapshotsRoot = "http://scala-tools.org/repo-snapshots"
val JavaNet2RepositoryName = "java.net Maven2 Repository"
val JavaNet2RepositoryRoot = "http://download.java.net/maven/2"
def typesafeRepo(status: String) = new MavenRepository("typesafe-" + status, TypesafeRepositoryRoot + "/" + status)
def typesafeIvyRepo(status: String) = url("typesafe-ivy-" + status, new URL(TypesafeRepositoryRoot + "/ivy-" + status + "/"))(ivyStylePatterns)
def sbtPluginRepo(status: String) = url("sbt-plugin-" + status, new URL(SbtPluginRepositoryRoot + "/sbt-plugin-" + status + "/"))(ivyStylePatterns)
def sonatypeRepo(status: String) = new MavenRepository("sonatype-" + status, SonatypeRepositoryRoot + "/" + status)
/** Add the local, Maven Central, and Scala Tools releases repositories to the user repositories. */
def withDefaultResolvers(userResolvers: Seq[Resolver]): Seq[Resolver] =
withDefaultResolvers(userResolvers, true)

16
main/Defaults.scala
View File

@ -59,7 +59,7 @@ object Defaults extends BuildCommon
parallelExecution :== true,
sbtVersion <<= appConfiguration { _.provider.id.version },
sbtBinaryVersion <<= sbtVersion apply binarySbtVersion,
sbtResolver <<= sbtVersion { sbtV => if(sbtV endsWith "-SNAPSHOT") Classpaths.typesafeSnapshots else Classpaths.typesafeResolver },
sbtResolver <<= sbtVersion { sbtV => if(sbtV endsWith "-SNAPSHOT") Classpaths.typesafeSnapshots else Classpaths.typesafeReleases },
pollInterval :== 500,
logBuffered :== false,
connectInput :== false,
@ -364,7 +364,7 @@ object Defaults extends BuildCommon
}
}
}
def selectedFilter(args: Seq[String]): String => Boolean =
{
@ -1102,9 +1102,15 @@ object Classpaths
flatten(defaultConfiguration in p get data) getOrElse Configurations.Default
def flatten[T](o: Option[Option[T]]): Option[T] = o flatMap idFun
lazy val typesafeSnapshots = typesafeRepo("snapshots")
lazy val typesafeResolver = typesafeRepo("releases")
def typesafeRepo(status: String) = Resolver.url("typesafe-ivy-"+status, new URL("http://repo.typesafe.com/typesafe/ivy-" + status + "/"))(Resolver.ivyStylePatterns)
lazy val typesafeReleases = Resolver.typesafeIvyRepo("releases")
lazy val typesafeSnapshots = Resolver.typesafeIvyRepo("snapshots")
@deprecated("Use `typesafeReleases` instead", "0.12.0")
lazy val typesafeResolver = typesafeReleases
@deprecated("Use `Resolver.typesafeIvyRepo` instead", "0.12.0")
def typesafeRepo(status: String) = Resolver.typesafeIvyRepo(status)
lazy val sbtPluginReleases = Resolver.sbtPluginRepo("releases")
lazy val sbtPluginSnapshots = Resolver.sbtPluginRepo("snapshots")
def modifyForPlugin(plugin: Boolean, dep: ModuleID): ModuleID =
if(plugin) dep.copy(configurations = Some(Provided.name)) else dep