From 2255bd5a6299515033e06a87565fc294b2d3637f Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Sun, 22 Jan 2012 22:06:52 -0500 Subject: [PATCH] org.scala-tools.sbt -> org.scala-sbt and dropping scala-tools.org from defaults --- ivy/ComponentManager.scala | 2 +- ivy/ConflictWarning.scala | 2 +- ivy/IvyInterface.scala | 3 +-- ivy/IvyScala.scala | 4 ++++ launch/BootConfiguration.scala | 2 +- launch/ConfigurationParser.scala | 2 +- launch/src/main/input_resources/sbt/sbt.boot.properties | 2 -- launch/src/test/scala/ScalaProviderTest.scala | 2 +- main/GlobalPlugin.scala | 2 +- project/Sbt.scala | 2 +- sbt/src/sbt-test/dependency-management/extra/DefineColor.sbt | 2 +- .../sbt-test/dependency-management/extra/changes/UseColor.sbt | 2 +- sbt/src/sbt-test/project/src-plugins/plugin/build.sbt | 2 +- scripted/plugin/ScriptedPlugin.scala | 2 +- src/main/conscript/sbt/launchconfig | 4 +--- src/main/conscript/scalas/launchconfig | 4 +--- src/main/conscript/screpl/launchconfig | 4 +--- 17 files changed, 19 insertions(+), 24 deletions(-) diff --git a/ivy/ComponentManager.scala b/ivy/ComponentManager.scala index 32979ab3b..de87a9890 100644 --- a/ivy/ComponentManager.scala +++ b/ivy/ComponentManager.scala @@ -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) } diff --git a/ivy/ConflictWarning.scala b/ivy/ConflictWarning.scala index 738ab50fc..befe4abd6 100644 --- a/ivy/ConflictWarning.scala +++ b/ivy/ConflictWarning.scala @@ -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) { diff --git a/ivy/IvyInterface.scala b/ivy/IvyInterface.scala index 7bf72b0dc..8d921c2ec 100644 --- a/ivy/IvyInterface.scala +++ b/ivy/IvyInterface.scala @@ -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. */ diff --git a/ivy/IvyScala.scala b/ivy/IvyScala.scala index 9926f7141..54f95ccf6 100644 --- a/ivy/IvyScala.scala +++ b/ivy/IvyScala.scala @@ -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._ diff --git a/launch/BootConfiguration.scala b/launch/BootConfiguration.scala index 3257df0d2..f2dda2d5d 100644 --- a/launch/BootConfiguration.scala +++ b/launch/BootConfiguration.scala @@ -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" diff --git a/launch/ConfigurationParser.scala b/launch/ConfigurationParser.scala index b4e54046f..0caf3c346 100644 --- a/launch/ConfigurationParser.scala +++ b/launch/ConfigurationParser.scala @@ -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") diff --git a/launch/src/main/input_resources/sbt/sbt.boot.properties b/launch/src/main/input_resources/sbt/sbt.boot.properties index fb2274de2..1b71a3702 100644 --- a/launch/src/main/input_resources/sbt/sbt.boot.properties +++ b/launch/src/main/input_resources/sbt/sbt.boot.properties @@ -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/} diff --git a/launch/src/test/scala/ScalaProviderTest.scala b/launch/src/test/scala/ScalaProviderTest.scala index 810e551ae..fd6823c27 100644 --- a/launch/src/test/scala/ScalaProviderTest.scala +++ b/launch/src/test/scala/ScalaProviderTest.scala @@ -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 = diff --git a/main/GlobalPlugin.scala b/main/GlobalPlugin.scala index 7cc554c69..b0fae7a35 100644 --- a/main/GlobalPlugin.scala +++ b/main/GlobalPlugin.scala @@ -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, diff --git a/project/Sbt.scala b/project/Sbt.scala index 9bcbe7925..b99bcc8d3 100644 --- a/project/Sbt.scala +++ b/project/Sbt.scala @@ -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", diff --git a/sbt/src/sbt-test/dependency-management/extra/DefineColor.sbt b/sbt/src/sbt-test/dependency-management/extra/DefineColor.sbt index b84a7f219..1c02cbcf5 100644 --- a/sbt/src/sbt-test/dependency-management/extra/DefineColor.sbt +++ b/sbt/src/sbt-test/dependency-management/extra/DefineColor.sbt @@ -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" diff --git a/sbt/src/sbt-test/dependency-management/extra/changes/UseColor.sbt b/sbt/src/sbt-test/dependency-management/extra/changes/UseColor.sbt index d7aff5e2e..3f87d7383 100644 --- a/sbt/src/sbt-test/dependency-management/extra/changes/UseColor.sbt +++ b/sbt/src/sbt-test/dependency-management/extra/changes/UseColor.sbt @@ -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 } diff --git a/sbt/src/sbt-test/project/src-plugins/plugin/build.sbt b/sbt/src/sbt-test/project/src-plugins/plugin/build.sbt index 0946055d0..705437046 100644 --- a/sbt/src/sbt-test/project/src-plugins/plugin/build.sbt +++ b/sbt/src/sbt-test/project/src-plugins/plugin/build.sbt @@ -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) } \ No newline at end of file diff --git a/scripted/plugin/ScriptedPlugin.scala b/scripted/plugin/ScriptedPlugin.scala index c94f8bded..3087b9495 100644 --- a/scripted/plugin/ScriptedPlugin.scala +++ b/scripted/plugin/ScriptedPlugin.scala @@ -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, diff --git a/src/main/conscript/sbt/launchconfig b/src/main/conscript/sbt/launchconfig index 66002f9da..a91393272 100644 --- a/src/main/conscript/sbt/launchconfig +++ b/src/main/conscript/sbt/launchconfig @@ -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/} diff --git a/src/main/conscript/scalas/launchconfig b/src/main/conscript/scalas/launchconfig index 4a373d19e..149c98163 100644 --- a/src/main/conscript/scalas/launchconfig +++ b/src/main/conscript/scalas/launchconfig @@ -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 diff --git a/src/main/conscript/screpl/launchconfig b/src/main/conscript/screpl/launchconfig index 5ff7415e7..d8570e91f 100644 --- a/src/main/conscript/screpl/launchconfig +++ b/src/main/conscript/screpl/launchconfig @@ -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