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

Merge pull request #301 from thkoch2001/smallfixes 

missing(?) imports, fix emacs syntax highlighting
This commit is contained in:
Indrajit Raychaudhuri 2011-12-14 07:18:22 -08:00
parent 38a529d037 9e8c441159
commit 6eaa59d1ab
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compile/CompilerArguments.scala
View File

@ -4,6 +4,7 @@
package sbt
package compiler
import scala.util
import java.io.File
import CompilerArguments.{abs, absString, BootClasspathOption}

1
compile/api/HashAPI.scala
View File

@ -3,6 +3,7 @@
*/
package xsbt.api
import scala.util
import xsbti.api._
import util.MurmurHash
import TagTypeVariables.TypeVars

6
project/Sbt.scala
View File

@ -29,7 +29,7 @@ object Sbt extends Build
lazy val root: Project = Project("xsbt", file("."), aggregate = nonRoots ) settings( rootSettings : _*) configs( Sxr.sxrConf, Proguard )
lazy val nonRoots = projects.filter(_ != root).map(p => LocalProject(p.id))
/*** Subproject declarations ***/
/* ** Subproject declarations ** */
// defines the Java interfaces through which the launcher and the launched application communicate
lazy val launchInterfaceSub = project(launchPath / "interface", "Launcher Interface") settings(javaOnly : _*)
@ -48,7 +48,7 @@ object Sbt extends Build
// and discovery of subclasses and annotations
lazy val apiSub = testedBaseProject(compilePath / "api", "API") dependsOn(interfaceSub)
/***** Utilities *****/
/* **** Utilities **** */
lazy val controlSub = baseProject(utilPath / "control", "Control")
lazy val collectionSub = testedBaseProject(utilPath / "collection", "Collections")
@ -67,7 +67,7 @@ object Sbt extends Build
// generates immutable or mutable Java data types according to a simple input format
lazy val datatypeSub = baseProject(utilPath /"datatype", "Datatype Generator") dependsOn(ioSub)
/***** Intermediate-level Modules *****/
/* **** Intermediate-level Modules **** */
// Apache Ivy integration
lazy val ivySub = baseProject(file("ivy"), "Ivy") dependsOn(interfaceSub, launchInterfaceSub, logSub % "compile;test->test", ioSub % "compile;test->test", launchSub % "test->test") settings(ivy, jsch, httpclient)