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

org.scala-tools.sbt -> org.scala-sbt and dropping scala-tools.org from defaults

This commit is contained in:
Mark Harrah 2012-01-22 22:06:52 -05:00
parent 28674af0d2
commit 2255bd5a62
17 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ivy/ComponentManager.scala
View File

@ -61,7 +61,7 @@ class ComponentManager(globalLock: xsbti.GlobalLock, provider: xsbti.ComponentPr
/** Retrieve the file for component 'id' from the local repository. */
private def update(id: String): Unit = ivyCache.withCachedJar(sbtModuleID(id), Some(globalLock), log)(jar => define(id, Seq(jar)) )
private def sbtModuleID(id: String) = ModuleID("org.scala-tools.sbt", id, ComponentManager.stampedVersion)
private def sbtModuleID(id: String) = ModuleID(SbtArtifacts.Organization, id, ComponentManager.stampedVersion)
/** Install the files for component 'id' to the local repository. This is usually used after writing files to the directory returned by 'location'. */
def cache(id: String): Unit = ivyCache.cacheJar(sbtModuleID(id), file(id)(IfMissing.Fail), Some(globalLock), log)
def clearCache(id: String): Unit = lockGlobalCache { ivyCache.clearCachedJar(sbtModuleID(id), Some(globalLock), log) }

2
ivy/ConflictWarning.scala
View File

@ -5,7 +5,7 @@ package sbt
final case class ConflictWarning(label: String, filter: ModuleFilter, group: ModuleID => String, level: Level.Value, failOnConflict: Boolean)
object ConflictWarning
{
def default(label: String): ConflictWarning = ConflictWarning(label, moduleFilter(organization = GlobFilter("org.scala-tools.sbt") | GlobFilter("org.scala-lang")), (_: ModuleID).organization, Level.Warn, false)
def default(label: String): ConflictWarning = ConflictWarning(label, moduleFilter(organization = GlobFilter(SbtArtifacts.Organization) | GlobFilter(ScalaArtifacts.Organization)), (_: ModuleID).organization, Level.Warn, false)
def apply(config: ConflictWarning, report: UpdateReport, log: Logger)
{

3
ivy/IvyInterface.scala
View File

@ -199,8 +199,7 @@ object Resolver
def withDefaultResolvers(userResolvers: Seq[Resolver], mavenCentral: Boolean, scalaTools: Boolean): Seq[Resolver] =
Seq(Resolver.defaultLocal) ++
userResolvers ++
single(DefaultMavenRepository, mavenCentral)++
single(ScalaToolsReleases, scalaTools)
single(DefaultMavenRepository, mavenCentral)
private def single[T](value: T, nonEmpty: Boolean): Seq[T] = if(nonEmpty) Seq(value) else Nil
/** A base class for defining factories for interfaces to Ivy repositories that require a hostname , port, and patterns. */

4
ivy/IvyScala.scala
View File

@ -19,6 +19,10 @@ object ScalaArtifacts
val CompilerID = "scala-compiler"
def libraryDependency(version: String): ModuleID = ModuleID(Organization, LibraryID, version)
}
object SbtArtifacts
{
val Organization = "org.scala-sbt"
}
import ScalaArtifacts._

2
launch/BootConfiguration.scala
View File

@ -18,7 +18,7 @@ private object BootConfiguration
val JUnitName = "junit"
val SbtOrg = "org.scala-tools.sbt"
val SbtOrg = "org.scala-sbt"
/** The Ivy conflict manager to use for updating.*/
val ConflictManagerName = "latest-revision"

2
launch/ConfigurationParser.scala
View File

@ -152,7 +152,7 @@ class ConfigurationParser
def getApplication(m: LabelMap): (Application, Value[List[String]]) =
{
val (org, m1) = id(m, "org", "org.scala-tools.sbt")
val (org, m1) = id(m, "org", BootConfiguration.SbtOrg)
val (name, m2) = id(m1, "name", "sbt")
val (rev, m3) = getVersion(m2, name + " version", name + ".version")
val (main, m4) = id(m3, "class", "xsbt.Main")

2
launch/src/main/input_resources/sbt/sbt.boot.properties
View File

@ -13,8 +13,6 @@
local
${{repositories}}
maven-central
scala-tools-releases
scala-tools-snapshots
[boot]
directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/}

2
launch/src/test/scala/ScalaProviderTest.scala
View File

@ -62,7 +62,7 @@ object ScalaProviderTest extends Specification
object LaunchTest
{
def testApp(main: String): Application = testApp(main, Array[File]())
def testApp(main: String, extra: Array[File]): Application = Application("org.scala-tools.sbt", "launch-test", new Explicit(AppVersion), main, Nil, false, extra)
def testApp(main: String, extra: Array[File]): Application = Application("org.scala-sbt", "launch-test", new Explicit(AppVersion), main, Nil, false, extra)
import Predefined._
def testRepositories = List(Local, ScalaToolsReleases, ScalaToolsSnapshots).map(Repository.Predefined.apply)
def withLauncher[T](f: xsbti.Launcher => T): T =

2
main/GlobalPlugin.scala
View File

@ -59,7 +59,7 @@ object GlobalPlugin
}
}
val globalPluginSettings = inScope(Scope.GlobalScope in LocalRootProject)(Seq(
organization := "org.scala-tools.sbt",
organization := "org.scala-sbt",
onLoadMessage <<= Keys.baseDirectory("Loading global plugins from " + _),
name := "global-plugin",
sbtPlugin := true,

2
project/Sbt.scala
View File

@ -14,7 +14,7 @@ object Sbt extends Build
{
override lazy val settings = super.settings ++ buildSettings ++ Status.settings
def buildSettings = Seq(
organization := "org.scala-tools.sbt",
organization := "org.scala-sbt",
version := "0.12.0-SNAPSHOT",
publishArtifact in packageDoc := false,
scalaVersion := "2.9.1",

2
sbt/src/sbt-test/dependency-management/extra/DefineColor.sbt
View File

@ -8,7 +8,7 @@ publishTo <<= baseDirectory { base =>
projectID <<= projectID { _.extra("e:color" -> "red") }
organization := "org.scala-tools.sbt"
organization := "org.scala-sbt"
version := "1.0"

2
sbt/src/sbt-test/dependency-management/extra/changes/UseColor.sbt
View File

@ -8,7 +8,7 @@ resolvers <<= baseDirectory( base =>
libraryDependencies <<= baseDirectory { base =>
val color = IO.read(base / "color")
val dep = "org.scala-tools.sbt" %% "define-color" % "1.0" extra("e:color" -> color)
val dep = "org.scala-sbt" %% "define-color" % "1.0" extra("e:color" -> color)
dep :: Nil
}

2
sbt/src/sbt-test/project/src-plugins/plugin/build.sbt
View File

@ -1,3 +1,3 @@
libraryDependencies <<= (libraryDependencies, appConfiguration) { (deps, conf) =>
deps :+ ("org.scala-tools.sbt" %% "sbt" % conf.provider.id.version)
deps :+ ("org.scala-sbt" %% "sbt" % conf.provider.id.version)
}

2
scripted/plugin/ScriptedPlugin.scala
View File

@ -49,7 +49,7 @@ object ScriptedPlugin extends Plugin {
ivyConfigurations += scriptedConf,
scriptedSbt <<= (appConfiguration)(_.provider.id.version),
scriptedScalas <<= (scalaVersion) { (scala) => ScriptedScalas(scala, scala) },
libraryDependencies <<= (libraryDependencies, scriptedScalas, scriptedSbt) {(deps, scalas, version) => deps :+ "org.scala-tools.sbt" % ("scripted-sbt_" + scalas.build) % version % scriptedConf.toString },
libraryDependencies <<= (libraryDependencies, scriptedScalas, scriptedSbt) {(deps, scalas, version) => deps :+ "org.scala-sbt" % ("scripted-sbt_" + scalas.build) % version % scriptedConf.toString },
sbtLauncher <<= (appConfiguration)(app => IO.classLocationFile(app.provider.scalaProvider.launcher.getClass)),
sbtTestDirectory <<= sourceDirectory / "sbt-test",
scriptedBufferLog := true,

4
src/main/conscript/sbt/launchconfig
View File

@ -2,7 +2,7 @@
version: 2.9.1
[app]
org: org.scala-tools.sbt
org: org.scala-sbt
name: sbt
version: read(sbt.version)[0.12.0-SNAPSHOT]
class: ${sbt.main.class-sbt.xMain}
@ -13,8 +13,6 @@
local
typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
maven-central
scala-tools-releases
scala-tools-snapshots
[ivy]
ivy-home: ${sbt.ivy.home-${user.home}/.ivy2/}

4
src/main/conscript/scalas/launchconfig
View File

@ -2,7 +2,7 @@
version: 2.9.1
[app]
org: org.scala-tools.sbt
org: org.scala-sbt
name: sbt
version: 0.12.0-SNAPSHOT
class: sbt.ScriptMain
@ -13,5 +13,3 @@
local
typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
maven-central
scala-tools-releases
scala-tools-snapshots

4
src/main/conscript/screpl/launchconfig
View File

@ -2,7 +2,7 @@
version: 2.9.1
[app]
org: org.scala-tools.sbt
org: org.scala-sbt
name: sbt
version: 0.12.0-SNAPSHOT
class: sbt.ConsoleMain
@ -13,5 +13,3 @@
local
typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
maven-central
scala-tools-releases
scala-tools-snapshots