diff options
author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-06-07 00:47:06 -0400 |
---|---|---|
committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-06-15 01:24:46 -0400 |
commit | b37e339c41483c15bf14f84be60c8470fd429d77 (patch) | |
tree | 5a0ce098df0f166d13d8018257817b799ad3889d /stage1 | |
parent | 81a8db46ce92f6f0b7b2c2661ae8f0a2f38e5adc (diff) | |
download | cbt-b37e339c41483c15bf14f84be60c8470fd429d77.tar.gz cbt-b37e339c41483c15bf14f84be60c8470fd429d77.tar.bz2 cbt-b37e339c41483c15bf14f84be60c8470fd429d77.zip |
Get rid of Build default imports to reduce noise in build files. This also changes builds from using immutable.Seq to using Predef.Seq in favor of simplicity over purity. This has been discussed on gitter.
Diffstat (limited to 'stage1')
-rw-r--r-- | stage1/ClassPath.scala | 4 | ||||
-rw-r--r-- | stage1/ContextImplementation.scala | 1 | ||||
-rw-r--r-- | stage1/MavenRepository.scala | 1 | ||||
-rw-r--r-- | stage1/MultiClassLoader.scala | 1 | ||||
-rw-r--r-- | stage1/Stage1.scala | 1 | ||||
-rw-r--r-- | stage1/Stage1Lib.scala | 4 | ||||
-rw-r--r-- | stage1/cbt.scala | 1 | ||||
-rw-r--r-- | stage1/resolver.scala | 12 |
8 files changed, 6 insertions, 19 deletions
diff --git a/stage1/ClassPath.scala b/stage1/ClassPath.scala index a3e1c1c..6e6f113 100644 --- a/stage1/ClassPath.scala +++ b/stage1/ClassPath.scala @@ -1,13 +1,11 @@ package cbt import java.io._ import java.net._ -import scala.collection.immutable.Seq object ClassPath{ - def apply(files: File*): ClassPath = ClassPath(files.toVector) def flatten( classPaths: Seq[ClassPath] ): ClassPath = ClassPath( classPaths.map(_.files).flatten ) } -case class ClassPath(files: Seq[File]){ +case class ClassPath(files: Seq[File] = Seq()){ private val duplicates = (files diff files.distinct).distinct assert( duplicates.isEmpty, diff --git a/stage1/ContextImplementation.scala b/stage1/ContextImplementation.scala index e4b63d3..91c54f4 100644 --- a/stage1/ContextImplementation.scala +++ b/stage1/ContextImplementation.scala @@ -1,7 +1,6 @@ package cbt import java.io._ import java.util.concurrent.ConcurrentHashMap -import scala.collection.immutable.Seq import java.lang._ case class ContextImplementation( diff --git a/stage1/MavenRepository.scala b/stage1/MavenRepository.scala index 06189d1..4184d2d 100644 --- a/stage1/MavenRepository.scala +++ b/stage1/MavenRepository.scala @@ -1,5 +1,4 @@ package cbt -import scala.collection.immutable.Seq import java.io._ import java.net._ case class MavenResolver( cbtHasChanged: Boolean, mavenCache: File, urls: URL* ){ diff --git a/stage1/MultiClassLoader.scala b/stage1/MultiClassLoader.scala index 3e3ba26..416e0cd 100644 --- a/stage1/MultiClassLoader.scala +++ b/stage1/MultiClassLoader.scala @@ -1,6 +1,5 @@ package cbt import java.net._ -import scala.collection.immutable.Seq // do not make this a case class, required object identity equality class MultiClassLoader(final val parents: Seq[ClassLoader])(implicit val logger: Logger) extends ClassLoader(null) with CachingClassLoader{ diff --git a/stage1/Stage1.scala b/stage1/Stage1.scala index 5b52f50..1059647 100644 --- a/stage1/Stage1.scala +++ b/stage1/Stage1.scala @@ -3,7 +3,6 @@ package cbt import java.io._ import java.util.concurrent.ConcurrentHashMap -import scala.collection.immutable.Seq import scala.collection.JavaConverters._ final case class Stage1ArgsParser(__args: Seq[String]) { diff --git a/stage1/Stage1Lib.scala b/stage1/Stage1Lib.scala index ac2c1b1..7b4db59 100644 --- a/stage1/Stage1Lib.scala +++ b/stage1/Stage1Lib.scala @@ -12,8 +12,6 @@ import java.util.{Set=>_,Map=>_,_} import java.util.concurrent.ConcurrentHashMap import javax.xml.bind.annotation.adapters.HexBinaryAdapter -import scala.collection.immutable.Seq - // CLI interop case class ExitCode(integer: Int) object ExitCode{ @@ -337,7 +335,7 @@ ${files.sorted.mkString(" \\\n")} def dependencyClassLoader( latest: Map[(String,String),Dependency], cache: ClassLoaderCache ): ClassLoader = { if( dependency.dependencies.isEmpty ){ // wrap for caching - new cbt.URLClassLoader( ClassPath(Seq()), ClassLoader.getSystemClassLoader().getParent() ) + new cbt.URLClassLoader( ClassPath(), ClassLoader.getSystemClassLoader().getParent() ) } else if( dependencies.size == 1 ){ classLoaderRecursion( dependencies.head, latest, cache ) } else{ diff --git a/stage1/cbt.scala b/stage1/cbt.scala index c264480..78015b6 100644 --- a/stage1/cbt.scala +++ b/stage1/cbt.scala @@ -2,7 +2,6 @@ package cbt import java.io._ import java.nio.file._ import java.net._ -import scala.collection.immutable.Seq import java.util.concurrent.ConcurrentHashMap object `package`{ diff --git a/stage1/resolver.scala b/stage1/resolver.scala index 864ab47..c2ebb62 100644 --- a/stage1/resolver.scala +++ b/stage1/resolver.scala @@ -3,7 +3,6 @@ import java.nio.file._ import java.nio.charset.StandardCharsets import java.net._ import java.io._ -import scala.collection.immutable.Seq import scala.xml._ import scala.concurrent._ import scala.concurrent.duration._ @@ -115,8 +114,8 @@ class ScalaReflectDependency (cbtHasChanged: Boolean, mavenCache: File, version: case class ScalaDependencies(cbtHasChanged: Boolean, mavenCache: File, version: String)(implicit val logger: Logger) extends DependencyImplementation{ sd => override final val needsUpdate = false - def targetClasspath = ClassPath(Seq()) - def exportedClasspath = ClassPath(Seq()) + def targetClasspath = ClassPath() + def exportedClasspath = ClassPath() def dependencies = Seq( new ScalaCompilerDependency(cbtHasChanged, mavenCache, version), new ScalaLibraryDependency(cbtHasChanged, mavenCache, version), @@ -133,11 +132,8 @@ case class BinaryDependency( path: File, dependencies: Seq[Dependency] )(implici /** Allows to easily assemble a bunch of dependencies */ case class Dependencies( dependencies: Seq[Dependency] )(implicit val logger: Logger) extends DependencyImplementation{ override def needsUpdate = dependencies.exists(_.needsUpdate) - override def exportedClasspath = ClassPath(Seq()) - override def targetClasspath = ClassPath(Seq()) -} -object Dependencies{ - def apply( dependencies: Dependency* )(implicit logger: Logger): Dependencies = Dependencies( dependencies.to ) + override def exportedClasspath = ClassPath() + override def targetClasspath = ClassPath() } case class Stage1Dependency(cbtHasChanged: Boolean, mavenCache: File, nailgunTarget: File, stage1Target: File, compatibilityTarget: File)(implicit val logger: Logger) extends DependencyImplementation{ |