From 9e8c441159e154e809b7dbafdbce9c290ba73fd4 Mon Sep 17 00:00:00 2001 From: Thomas Koch Date: Wed, 14 Dec 2011 14:34:57 +0100 Subject: [PATCH] missing(?) imports, fix emacs syntax highlighting While trying to build sbt without sbt, I got compile errors claiming that util.Random would not be a member of util. The added import statements fixed this. The inserted spaces in the comments in project/Sbt.scala are a work around in a bug in emacs scala syntax highlighting. --- compile/CompilerArguments.scala | 1 + compile/api/HashAPI.scala | 1 + project/Sbt.scala | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/compile/CompilerArguments.scala b/compile/CompilerArguments.scala index d8be529ee..e2e6af4ea 100644 --- a/compile/CompilerArguments.scala +++ b/compile/CompilerArguments.scala @@ -4,6 +4,7 @@ package sbt package compiler + import scala.util import java.io.File import CompilerArguments.{abs, absString, BootClasspathOption} diff --git a/compile/api/HashAPI.scala b/compile/api/HashAPI.scala index e76292402..c47847161 100644 --- a/compile/api/HashAPI.scala +++ b/compile/api/HashAPI.scala @@ -3,6 +3,7 @@ */ package xsbt.api +import scala.util import xsbti.api._ import util.MurmurHash import TagTypeVariables.TypeVars diff --git a/project/Sbt.scala b/project/Sbt.scala index 177a6f3c0..84c365f17 100644 --- a/project/Sbt.scala +++ b/project/Sbt.scala @@ -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)