diff options
29 files changed, 15 insertions, 92 deletions
diff --git a/build/build.scala b/build/build.scala index cb6886b..1b69a14 100644 --- a/build/build.scala +++ b/build/build.scala @@ -1,7 +1,4 @@ import cbt._ -import java.net.URL -import java.io.File -import scala.collection.immutable.Seq class Build(val context: Context) extends BaseBuild{ // FIXME: somehow consolidate this with cbt's own boot-strapping from source. diff --git a/examples/build-scalatest/build/build.scala b/examples/build-scalatest/build/build.scala index 6cc013d..29d7bf4 100644 --- a/examples/build-scalatest/build/build.scala +++ b/examples/build-scalatest/build/build.scala @@ -1,8 +1,4 @@ import cbt._ -import java.net.URL -import java.io.File -import scala.collection.immutable.Seq - class Build(val context: Context) extends SbtLayout { override def dependencies = ( diff --git a/examples/build-scalatest/build/build/build.scala b/examples/build-scalatest/build/build/build.scala index c17686a..2aece46 100644 --- a/examples/build-scalatest/build/build/build.scala +++ b/examples/build-scalatest/build/build/build.scala @@ -1,7 +1,4 @@ import cbt._ -import java.net.URL -import java.io.File -import scala.collection.immutable.Seq class Build(val context: Context) extends BuildBuild{ diff --git a/plugins/scalatest/ScalaTest.scala b/plugins/scalatest/ScalaTest.scala index 7f1c77a..9335982 100644 --- a/plugins/scalatest/ScalaTest.scala +++ b/plugins/scalatest/ScalaTest.scala @@ -1,7 +1,4 @@ import cbt._ -import java.net.URL -import java.io.File -import scala.collection.immutable.Seq import org.scalatest._ import org.scalatest diff --git a/plugins/scalatest/build/build.scala b/plugins/scalatest/build/build.scala index 55d5818..0306ba7 100644 --- a/plugins/scalatest/build/build.scala +++ b/plugins/scalatest/build/build.scala @@ -1,7 +1,4 @@ import cbt._ -import java.net.URL -import java.io.File -import scala.collection.immutable.Seq class Build(val context: Context) extends BaseBuild{ override def dependencies = 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{ diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala index 49a73ef..3d27261 100644 --- a/stage2/BasicBuild.scala +++ b/stage2/BasicBuild.scala @@ -7,7 +7,6 @@ import java.nio.file.Files.readAllBytes import java.security.MessageDigest import java.util.jar._ -import scala.collection.immutable.Seq import scala.util._ trait Recommended extends BaseBuild{ @@ -113,7 +112,7 @@ trait BaseBuild extends DependencyImplementation with BuildInterface with Trigge override def dependencyClasspath : ClassPath = ClassPath(localJars) ++ super.dependencyClasspath - def exportedClasspath : ClassPath = ClassPath(compile.toSeq:_*) + def exportedClasspath : ClassPath = ClassPath(compile.toSeq) def targetClasspath = ClassPath(Seq(compileTarget)) // ========== compile, run, test ========== diff --git a/stage2/BuildBuild.scala b/stage2/BuildBuild.scala index 901e860..8ac619c 100644 --- a/stage2/BuildBuild.scala +++ b/stage2/BuildBuild.scala @@ -1,7 +1,6 @@ package cbt -import java.io.File +import java.io._ import java.nio.file._ -import scala.collection.immutable.Seq trait BuildBuild extends BaseBuild{ override def dependencies = diff --git a/stage2/BuildDependency.scala b/stage2/BuildDependency.scala index f6b6911..aba35c6 100644 --- a/stage2/BuildDependency.scala +++ b/stage2/BuildDependency.scala @@ -1,6 +1,5 @@ package cbt import java.io.File -import scala.collection.immutable.Seq /* sealed abstract class ProjectProxy extends Ha{ protected def delegate: ProjectMetaData @@ -22,11 +21,11 @@ case class BuildDependency(context: Context) extends TriggerLoop{ final override lazy val lib: Lib = new Lib(logger) private val root = lib.loadRoot( context.copy(args=Seq()) ) lazy val build = root.finalBuild - def exportedClasspath = ClassPath(Seq()) + def exportedClasspath = ClassPath() def dependencies = Seq(build) def triggerLoopFiles = root.triggerLoopFiles override final val needsUpdate = build.needsUpdate - def targetClasspath = ClassPath(Seq()) + def targetClasspath = ClassPath() } /* case class DependencyOr(first: BuildDependency, second: JavaDependency) extends ProjectProxy with BuildDependencyBase{ diff --git a/stage2/GitDependency.scala b/stage2/GitDependency.scala index 0457c3c..bb3cc63 100644 --- a/stage2/GitDependency.scala +++ b/stage2/GitDependency.scala @@ -1,7 +1,6 @@ package cbt import java.io._ import java.net._ -import scala.collection.immutable.Seq import org.eclipse.jgit.api._ import org.eclipse.jgit.lib.Ref @@ -49,7 +48,7 @@ case class GitDependency( def dependencies = Seq(dependency) - def exportedClasspath = ClassPath(Seq()) + def exportedClasspath = ClassPath() private[cbt] def targetClasspath = exportedClasspath def needsUpdate: Boolean = false } diff --git a/stage2/Lib.scala b/stage2/Lib.scala index cec302a..2430c1d 100644 --- a/stage2/Lib.scala +++ b/stage2/Lib.scala @@ -9,7 +9,6 @@ import java.security.MessageDigest import java.util.jar._ import java.lang.reflect.Method -import scala.collection.immutable.Seq import scala.util._ // pom model diff --git a/stage2/PackageJars.scala b/stage2/PackageJars.scala index 8e3f424..05e625b 100644 --- a/stage2/PackageJars.scala +++ b/stage2/PackageJars.scala @@ -1,6 +1,5 @@ package cbt import java.io.File -import scala.collection.immutable.Seq // would love to call this just `Package` but that conflicts with scala package objects. trait PackageJars extends BaseBuild with ArtifactInfo{ def name: String diff --git a/stage2/Publish.scala b/stage2/Publish.scala index 2f7d2fe..8cdb65b 100644 --- a/stage2/Publish.scala +++ b/stage2/Publish.scala @@ -2,7 +2,6 @@ package cbt import java.io.File import java.net.URL import java.nio.file.Files.readAllBytes -import scala.collection.immutable.Seq trait Publish extends PackageJars{ def description: String diff --git a/stage2/Scaffold.scala b/stage2/Scaffold.scala index 2c46d0a..0214a0d 100644 --- a/stage2/Scaffold.scala +++ b/stage2/Scaffold.scala @@ -28,10 +28,6 @@ trait Scaffold{ projectDirectory: File ): Unit = { createFile(projectDirectory, "build/build.scala", s"""import cbt._ -import java.net.URL -import java.io.File -import scala.collection.immutable.Seq - class Build(val context: Context) extends BaseBuild{ /* override def dependencies = ( @@ -61,10 +57,6 @@ class Build(val context: Context) extends BaseBuild{ projectDirectory: File ): Unit = { createFile(projectDirectory, "build/build/build.scala", s"""import cbt._ -import java.net.URL -import java.io.File -import scala.collection.immutable.Seq - class Build(val context: Context) extends BuildBuild{ /* override def dependencies = ( @@ -93,10 +85,6 @@ class Build(val context: Context) extends BuildBuild{ /*, "build/build/build.scala" -> s"""import cbt._ -import java.net.URL -import java.io.File -import scala.collection.immutable.Seq - class Build(val context: Context) extends BuildBuild{ override def dependencies = super.dependencies ++ Seq( BuildDependency( projectDirectory.parent ++ "/build-shared") @@ -113,10 +101,6 @@ class Build(val context: Context) extends BuildBuild{ """, "test/build/build.scala" -> s"""import cbt._ -import java.net.URL -import java.io.File -import scala.collection.immutable.Seq - class Build(val context: Context) extends BaseBuild with BuildShared/* with mixins.ScalaTest*/{ // def scalaTestVersion = "2.2.6" @@ -127,10 +111,6 @@ class Build(val context: Context) extends BaseBuild with BuildShared/* with mixi """, "test/build/build/build.scala" -> s"""import cbt._ -import java.net.URL -import java.io.File -import scala.collection.immutable.Seq - class Build(val context: Context) extends BuildBuild{ override def scalaVersion: String = "2.11.8" @@ -142,10 +122,6 @@ class Build(val context: Context) extends BuildBuild{ """, "build-shared/build/build.scala" -> s"""import cbt._ -import java.net.URL -import java.io.File -import scala.collection.immutable.Seq - class Build(val context: Context) extends BaseBuild{ override def scalaVersion: String = "$scalaVersion" @@ -157,10 +133,6 @@ class Build(val context: Context) extends BaseBuild{ """, "build-shared/BuildShared.scala" -> s"""import cbt._ -import java.net.URL -import java.io.File -import scala.collection.immutable.Seq - trait BuildShared extends BaseBuild{ override def scalaVersion: String = "$scalaVersion" override def enableConcurrency = false // enable for speed, disable for debugging diff --git a/stage2/Stage2.scala b/stage2/Stage2.scala index b911f50..9ef96fa 100644 --- a/stage2/Stage2.scala +++ b/stage2/Stage2.scala @@ -1,10 +1,6 @@ package cbt - import java.io._ -import scala.collection.immutable.Seq - - object Stage2 extends Stage2Base{ def getBuild(__context: java.lang.Object, _cbtChanged: java.lang.Boolean) = { val _context = __context.asInstanceOf[Context] diff --git a/stage2/ToolsTasks.scala b/stage2/ToolsTasks.scala index d388f12..bac3406 100644 --- a/stage2/ToolsTasks.scala +++ b/stage2/ToolsTasks.scala @@ -1,5 +1,4 @@ package cbt -import scala.collection.immutable.Seq import java.net._ import java.io.{Console=>_,_} import java.nio.file._ @@ -67,8 +66,10 @@ class ToolsTasks( ) val scalaXml = Dependencies( - Resolver(mavenCentral).bindOne(MavenDependency("org.scala-lang.modules","scala-xml_"+scalaMajorVersion,scalaXmlVersion)), - Resolver(mavenCentral).bindOne(MavenDependency("org.scala-lang","scala-library",scalaVersion)) + Resolver(mavenCentral).bind( + MavenDependency("org.scala-lang.modules","scala-xml_"+scalaMajorVersion,scalaXmlVersion), + MavenDependency("org.scala-lang","scala-library",scalaVersion) + ) ) val zinc = Resolver(mavenCentral).bindOne(MavenDependency("com.typesafe.zinc","zinc",zincVersion)) diff --git a/stage2/mixins.scala b/stage2/mixins.scala index 9d5fdb2..221fcc5 100644 --- a/stage2/mixins.scala +++ b/stage2/mixins.scala @@ -1,7 +1,6 @@ package cbt package mixins import java.net.URL -import scala.collection.immutable.Seq import java.io._ trait Test extends BaseBuild{ lazy val testedBuild = BuildDependency( projectDirectory.parent ) diff --git a/test/build/build.scala b/test/build/build.scala index 42ae856..aef96a6 100644 --- a/test/build/build.scala +++ b/test/build/build.scala @@ -1,6 +1,4 @@ import cbt._ -import java.io.File -import scala.collection.immutable.Seq class Build(val context: cbt.Context) extends BaseBuild{ override def dependencies = Seq( context.cbtDependency ) ++ super.dependencies } diff --git a/test/multi-build/build/build.scala b/test/multi-build/build/build.scala index 84e3f30..5ab1565 100644 --- a/test/multi-build/build/build.scala +++ b/test/multi-build/build/build.scala @@ -1,6 +1,4 @@ import cbt._ -import scala.collection.immutable.Seq -import java.io.File class Build(val context: Context) extends BaseBuild{ override def dependencies = Seq( BuildDependency(projectDirectory++"/sub1"), diff --git a/test/simple-fixed/build/build.scala b/test/simple-fixed/build/build.scala index f74820a..3f1ff66 100644 --- a/test/simple-fixed/build/build.scala +++ b/test/simple-fixed/build/build.scala @@ -1,6 +1,4 @@ import cbt._ -import scala.collection.immutable.Seq -import java.io.File // cbt:https://github.com/cvogt/cbt.git#ca412e26d70a6615153136019b7966acb9939446 class Build(context: cbt.Context) extends BasicBuild(context){ diff --git a/test/simple/build/build.scala b/test/simple/build/build.scala index f64d813..cf41c8c 100644 --- a/test/simple/build/build.scala +++ b/test/simple/build/build.scala @@ -1,6 +1,4 @@ import cbt._ -import scala.collection.immutable.Seq -import java.io.File class Build(val context: cbt.Context) extends BaseBuild{ override def dependencies = ( diff --git a/test/test.scala b/test/test.scala index 59684f4..5a4392f 100644 --- a/test/test.scala +++ b/test/test.scala @@ -1,5 +1,4 @@ import cbt._ -import scala.collection.immutable.Seq import java.util.concurrent.ConcurrentHashMap import java.io.File import java.net.URL |