aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2016-10-03 20:54:04 -0400
committerChristopher Vogt <oss.nsp@cvogt.org>2016-10-03 20:54:04 -0400
commit1f4f6097d3ca682d6fd20a7cc6dd277832350827 (patch)
tree48b778da611c18a092ae67cecca448af39916869
parent669ef3dfc3201fffa451b47d2b629a856afc0b25 (diff)
downloadcbt-1f4f6097d3ca682d6fd20a7cc6dd277832350827.tar.gz
cbt-1f4f6097d3ca682d6fd20a7cc6dd277832350827.tar.bz2
cbt-1f4f6097d3ca682d6fd20a7cc6dd277832350827.zip
make BuildInterfaces an abstract class so it can have default values
and it becomes slightly easier to maintain source compatibility between cbt versions
-rw-r--r--compatibility/BuildInterface.java2
-rw-r--r--stage1/resolver.scala4
-rw-r--r--stage2/BasicBuild.scala2
3 files changed, 4 insertions, 4 deletions
diff --git a/compatibility/BuildInterface.java b/compatibility/BuildInterface.java
index 636ded9..f061832 100644
--- a/compatibility/BuildInterface.java
+++ b/compatibility/BuildInterface.java
@@ -1,7 +1,7 @@
package cbt;
import java.io.*;
-public interface BuildInterface extends Dependency{
+public abstract class BuildInterface implements Dependency{
public abstract BuildInterface copy(Context context); // needed to configure builds
public abstract String scalaVersion(); // needed to propagate scalaVersion to dependent builds
public abstract String[] crossScalaVersionsArray(); // FIXME: this probably can't use Scala classes
diff --git a/stage1/resolver.scala b/stage1/resolver.scala
index c2ebb62..13e8e52 100644
--- a/stage1/resolver.scala
+++ b/stage1/resolver.scala
@@ -7,7 +7,7 @@ import scala.xml._
import scala.concurrent._
import scala.concurrent.duration._
-abstract class DependencyImplementation extends Dependency{
+trait DependencyImplementation extends Dependency{
implicit protected def logger: Logger
protected def lib = new Stage1Lib(logger)
@@ -196,7 +196,7 @@ object MavenDependency{
// FIXME: take MavenResolver instead of mavenCache and repositories separately
case class BoundMavenDependency(
cbtHasChanged: Boolean, mavenCache: File, mavenDependency: MavenDependency, repositories: Seq[URL]
-)(implicit val logger: Logger) extends DependencyImplementation with ArtifactInfo{
+)(implicit val logger: Logger) extends ArtifactInfo with DependencyImplementation{
val MavenDependency( groupId, artifactId, version, classifier ) = mavenDependency
assert(
Option(groupId).collect{
diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala
index 98deddc..007c27e 100644
--- a/stage2/BasicBuild.scala
+++ b/stage2/BasicBuild.scala
@@ -10,7 +10,7 @@ import java.util.jar._
import scala.util._
class BasicBuild(val context: Context) extends BaseBuild
-trait BaseBuild extends DependencyImplementation with BuildInterface with TriggerLoop with SbtDependencyDsl{
+trait BaseBuild extends BuildInterface with DependencyImplementation with TriggerLoop with SbtDependencyDsl{
def context: Context
// library available to builds