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

Depend on sbt/util

This commit is contained in:
Eugene Yokota 2015-08-20 01:33:22 -04:00
parent 887cb7cc3e
commit e81b378214
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -40,7 +40,7 @@ lazy val root = (project in file(".")).
lazy val lm = (project in file("librarymanagement")).
settings(
commonSettings,
libraryDependencies ++= Seq(interfaceProj, logProj % "compile;test->test", ioProj % "compile;test->test", collectionProj),
libraryDependencies ++= Seq(utilLogging % "compile;test->test", ioProj % "compile;test->test", utilCollection),
libraryDependencies ++= Seq(ivy, jsch, sbtSerialization, scalaReflect.value, launcherInterface),
name := "librarymanagement"
)

10
librarymanagement/src/main/scala/sbt/IvyScala.scala
View File

@ -12,10 +12,9 @@ import org.apache.ivy.core.module.id.{ ArtifactId, ModuleId, ModuleRevisionId }
import org.apache.ivy.plugins.matcher.ExactPatternMatcher
object ScalaArtifacts {
import xsbti.ArtifactInfo._
val Organization = ScalaOrganization
val LibraryID = ScalaLibraryID
val CompilerID = ScalaCompilerID
val Organization = "org.scala-lang"
val LibraryID = "scala-library"
val CompilerID = "scala-compiler"
val ReflectID = "scala-reflect"
def libraryDependency(version: String): ModuleID = ModuleID(Organization, LibraryID, version)
@ -27,8 +26,7 @@ object ScalaArtifacts {
ModuleID(org, id, version, Some(Configurations.ScalaTool.name + "->default,optional(default)"))
}
object SbtArtifacts {
import xsbti.ArtifactInfo._
val Organization = SbtOrganization
val Organization = "org.scala-sbt"
}
import ScalaArtifacts._

7
project/Dependencies.scala
View File

@ -2,12 +2,11 @@ import sbt._
import Keys._
object Dependencies {
val utilVersion = "1.0.0-SNAPSHOT"
val bootstrapSbtVersion = "0.13.8"
lazy val interfaceProj = "org.scala-sbt" % "interface" % bootstrapSbtVersion
lazy val ioProj = "org.scala-sbt" % "io" % bootstrapSbtVersion
lazy val collectionProj = "org.scala-sbt" % "collections" % bootstrapSbtVersion
lazy val logProj = "org.scala-sbt" % "logging" % bootstrapSbtVersion
// lazy val crossProj = "org.scala-sbt" % "cross" % bootstrapSbtVersion
lazy val utilCollection = "org.scala-sbt.util" %% "util-collection" % utilVersion
lazy val utilLogging = "org.scala-sbt.util" %% "util-logging" % utilVersion
lazy val launcherInterface = "org.scala-sbt" % "launcher-interface" % "1.0.0-M1"
lazy val ivy = "org.scala-sbt.ivy" % "ivy" % "2.3.0-sbt-927bc9ded7f8fba63297cddd0d5a3d01d6ad5d8d"