mirror of https://github.com/sbt/sbt.git
Cleanup Dependencies
This commit is contained in:
Dale Wijnand
parent
8a9ce1bf13
commit
cb2e17a347
|
|
@ -195,7 +195,7 @@ lazy val mainSettingsProj = (project in file("main-settings")).
|
|||
utilLogging, sbtIO, utilCompletion, compilerClasspath, libraryManagement)
|
||||
)
|
||||
|
||||
// The main integration project for sbt. It brings all of the Projsystems together, configures them, and provides for overriding conventions.
|
||||
// The main integration project for sbt. It brings all of the projects together, configures them, and provides for overriding conventions.
|
||||
lazy val mainProj = (project in file("main")).
|
||||
dependsOn(actionsProj, mainSettingsProj, runProj, commandProj).
|
||||
settings(
|
||||
|
|
@ -216,7 +216,7 @@ lazy val sbtProj = (project in file("sbt")).
|
|||
normalizedName := "sbt",
|
||||
crossScalaVersions := Seq(scala211),
|
||||
crossPaths := false,
|
||||
libraryDependencies ++= Seq(compilerBrdige)
|
||||
libraryDependencies ++= Seq(compilerBridge)
|
||||
)
|
||||
|
||||
def scriptedTask: Def.Initialize[InputTask[Unit]] = Def.inputTask {
|
||||
|
|
|
|||
|
|
@ -2,54 +2,59 @@ import sbt._
|
|||
import Keys._
|
||||
|
||||
object Dependencies {
|
||||
lazy val scala282 = "2.8.2"
|
||||
lazy val scala292 = "2.9.2"
|
||||
lazy val scala293 = "2.9.3"
|
||||
lazy val scala210 = "2.10.6"
|
||||
lazy val scala211 = "2.11.8"
|
||||
val scala282 = "2.8.2"
|
||||
val scala292 = "2.9.2"
|
||||
val scala293 = "2.9.3"
|
||||
val scala210 = "2.10.6"
|
||||
val scala211 = "2.11.8"
|
||||
|
||||
// sbt modules
|
||||
val ioVersion = "1.0.0-M6"
|
||||
val ioVersion = "1.0.0-M6"
|
||||
val utilVersion = "0.1.0-M14"
|
||||
val librarymanagementVersion = "0.1.0-X1"
|
||||
val lmVersion = "0.1.0-X1"
|
||||
val zincVersion = "1.0.0-X3"
|
||||
lazy val sbtIO = "org.scala-sbt" %% "io" % ioVersion
|
||||
lazy val utilCollection = "org.scala-sbt" %% "util-collection" % utilVersion
|
||||
lazy val utilLogging = "org.scala-sbt" %% "util-logging" % utilVersion
|
||||
lazy val utilTesting = "org.scala-sbt" %% "util-testing" % utilVersion
|
||||
lazy val utilControl = "org.scala-sbt" %% "util-control" % utilVersion
|
||||
lazy val utilCompletion = "org.scala-sbt" %% "util-completion" % utilVersion
|
||||
lazy val utilApplyMacro = "org.scala-sbt" %% "util-apply-macro" % utilVersion
|
||||
lazy val utilRelation = "org.scala-sbt" %% "util-relation" % utilVersion
|
||||
lazy val utilLogic = "org.scala-sbt" %% "util-logic" % utilVersion
|
||||
lazy val utilCache = "org.scala-sbt" %% "util-cache" % utilVersion
|
||||
lazy val utilTracking = "org.scala-sbt" %% "util-tracking" % utilVersion
|
||||
lazy val utilScripted = "org.scala-sbt" %% "util-scripted" % utilVersion
|
||||
lazy val libraryManagement = "org.scala-sbt" %% "librarymanagement" % librarymanagementVersion
|
||||
lazy val launcherInterface = "org.scala-sbt" % "launcher-interface" % "1.0.0"
|
||||
lazy val rawLauncher = "org.scala-sbt" % "launcher" % "1.0.0"
|
||||
lazy val testInterface = "org.scala-sbt" % "test-interface" % "1.0"
|
||||
|
||||
lazy val zinc = "org.scala-sbt" %% "zinc" % zincVersion
|
||||
lazy val zincCompile = "org.scala-sbt" %% "zinc-compile" % zincVersion
|
||||
lazy val compilerInterface = "org.scala-sbt" % "compiler-interface" % zincVersion
|
||||
lazy val compilerBrdige = "org.scala-sbt" %% "compiler-bridge" % zincVersion
|
||||
lazy val compilerClasspath = "org.scala-sbt" %% "zinc-classpath" % zincVersion
|
||||
lazy val compilerApiInfo = "org.scala-sbt" %% "zinc-apiinfo" % zincVersion
|
||||
lazy val compilerIvyIntegration = "org.scala-sbt" %% "zinc-ivy-integration" % zincVersion
|
||||
lazy val sjsonNewScalaJson = "com.eed3si9n" %% "sjson-new-scalajson" % "0.4.2"
|
||||
val sbtIO = "org.scala-sbt" %% "io" % ioVersion
|
||||
|
||||
lazy val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.11.4"
|
||||
lazy val specs2 = "org.specs2" %% "specs2" % "2.3.11"
|
||||
lazy val junit = "junit" % "junit" % "4.11"
|
||||
val utilApplyMacro = "org.scala-sbt" %% "util-apply-macro" % utilVersion
|
||||
val utilCache = "org.scala-sbt" %% "util-cache" % utilVersion
|
||||
val utilCollection = "org.scala-sbt" %% "util-collection" % utilVersion
|
||||
val utilCompletion = "org.scala-sbt" %% "util-completion" % utilVersion
|
||||
val utilControl = "org.scala-sbt" %% "util-control" % utilVersion
|
||||
val utilLogging = "org.scala-sbt" %% "util-logging" % utilVersion
|
||||
val utilLogic = "org.scala-sbt" %% "util-logic" % utilVersion
|
||||
val utilRelation = "org.scala-sbt" %% "util-relation" % utilVersion
|
||||
val utilScripted = "org.scala-sbt" %% "util-scripted" % utilVersion
|
||||
val utilTesting = "org.scala-sbt" %% "util-testing" % utilVersion
|
||||
val utilTracking = "org.scala-sbt" %% "util-tracking" % utilVersion
|
||||
|
||||
private def scala211Module(name: String, moduleVersion: String) =
|
||||
Def.setting {
|
||||
scalaVersion.value match {
|
||||
case sv if (sv startsWith "2.9.") || (sv startsWith "2.10.") => Nil
|
||||
case _ => ("org.scala-lang.modules" %% name % moduleVersion) :: Nil
|
||||
}
|
||||
val libraryManagement = "org.scala-sbt" %% "librarymanagement" % lmVersion
|
||||
|
||||
val launcherInterface = "org.scala-sbt" % "launcher-interface" % "1.0.0"
|
||||
val rawLauncher = "org.scala-sbt" % "launcher" % "1.0.0"
|
||||
val testInterface = "org.scala-sbt" % "test-interface" % "1.0"
|
||||
|
||||
val compilerApiInfo = "org.scala-sbt" %% "zinc-apiinfo" % zincVersion
|
||||
val compilerBridge = "org.scala-sbt" %% "compiler-bridge" % zincVersion
|
||||
val compilerClasspath = "org.scala-sbt" %% "zinc-classpath" % zincVersion
|
||||
val compilerInterface = "org.scala-sbt" % "compiler-interface" % zincVersion
|
||||
val compilerIvyIntegration = "org.scala-sbt" %% "zinc-ivy-integration" % zincVersion
|
||||
val zinc = "org.scala-sbt" %% "zinc" % zincVersion
|
||||
val zincCompile = "org.scala-sbt" %% "zinc-compile" % zincVersion
|
||||
|
||||
val sjsonNewScalaJson = "com.eed3si9n" %% "sjson-new-scalajson" % "0.4.2"
|
||||
|
||||
val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.11.4"
|
||||
val specs2 = "org.specs2" %% "specs2" % "2.3.11"
|
||||
val junit = "junit" % "junit" % "4.11"
|
||||
|
||||
private def scala211Module(name: String, moduleVersion: String) = Def setting (
|
||||
scalaBinaryVersion.value match {
|
||||
case "2.9" | "2.10" => Nil
|
||||
case _ => ("org.scala-lang.modules" %% name % moduleVersion) :: Nil
|
||||
}
|
||||
lazy val scalaXml = scala211Module("scala-xml", "1.0.1")
|
||||
lazy val scalaParsers = scala211Module("scala-parser-combinators", "1.0.1")
|
||||
)
|
||||
|
||||
val scalaXml = scala211Module("scala-xml", "1.0.1")
|
||||
val scalaParsers = scala211Module("scala-parser-combinators", "1.0.1")
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue