aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2016-03-11 23:28:02 -0500
committerChristopher Vogt <oss.nsp@cvogt.org>2016-03-11 23:28:02 -0500
commit55fff670befc97a871cf0f85c65764e108f3d3c1 (patch)
tree32ad95e2684481c47b9ed4bbbc057d8f58280372
parent958e50e5e2f8bc5447071554ad32ef47be1c33ad (diff)
downloadcbt-55fff670befc97a871cf0f85c65764e108f3d3c1.tar.gz
cbt-55fff670befc97a871cf0f85c65764e108f3d3c1.tar.bz2
cbt-55fff670befc97a871cf0f85c65764e108f3d3c1.zip
minor refactorings
-rw-r--r--stage1/ClassLoaderCache.scala2
-rw-r--r--stage2/Lib.scala2
-rw-r--r--stage2/PackageBuild.scala2
3 files changed, 3 insertions, 3 deletions
diff --git a/stage1/ClassLoaderCache.scala b/stage1/ClassLoaderCache.scala
index ec343f4..18a0d0e 100644
--- a/stage1/ClassLoaderCache.scala
+++ b/stage1/ClassLoaderCache.scala
@@ -2,7 +2,7 @@ package cbt
import java.net._
-object ClassLoaderCache{
+private[cbt] object ClassLoaderCache{
private val cache = NailgunLauncher.classLoaderCache
def get( classpath: ClassPath )(implicit logger: Logger): ClassLoader
= cache.synchronized{
diff --git a/stage2/Lib.scala b/stage2/Lib.scala
index 7b07d06..e87a19d 100644
--- a/stage2/Lib.scala
+++ b/stage2/Lib.scala
@@ -192,7 +192,7 @@ final class Lib(logger: Logger) extends Stage1Lib(logger) with Scaffold{
}
System.err.println(usage)
taskName.foreach{ _ =>
- System.exit(1)
+ ExitCode.Failure
}
}
}
diff --git a/stage2/PackageBuild.scala b/stage2/PackageBuild.scala
index b037e7f..4c4e478 100644
--- a/stage2/PackageBuild.scala
+++ b/stage2/PackageBuild.scala
@@ -2,7 +2,7 @@ package cbt
import java.io.File
import java.net.URL
import scala.collection.immutable.Seq
-abstract class PackageBuild(context: Context) extends Build(context) with ArtifactInfo{
+abstract class PackageBuild(context: Context) extends BasicBuild(context) with ArtifactInfo{
def `package`: Seq[File] = lib.concurrently( enableConcurrency )(
Seq(() => jar, () => docJar, () => srcJar)
)( _() )