aboutsummaryrefslogtreecommitdiff
path: root/stage2
diff options
context:
space:
mode:
Diffstat (limited to 'stage2')
-rw-r--r--stage2/BasicBuild.scala3
-rw-r--r--stage2/BuildBuild.scala3
-rw-r--r--stage2/BuildDependency.scala5
-rw-r--r--stage2/GitDependency.scala3
-rw-r--r--stage2/Lib.scala1
-rw-r--r--stage2/PackageJars.scala1
-rw-r--r--stage2/Publish.scala1
-rw-r--r--stage2/Scaffold.scala28
-rw-r--r--stage2/Stage2.scala4
-rw-r--r--stage2/ToolsTasks.scala7
-rw-r--r--stage2/mixins.scala1
11 files changed, 9 insertions, 48 deletions
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 )
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-01 15:53:22 +0000