aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2016-06-01 20:43:15 -0400
committerChristopher Vogt <oss.nsp@cvogt.org>2016-06-01 21:50:05 -0400
commit9a4ffa76d7a66dbb4bf165ebbd65106553a89e9f (patch)
tree02406cac9cdad3347dbafc1b32ad0aa429457e27
parentdd5089e8f43e656300ebfea4f719e8be5e88084f (diff)
downloadcbt-9a4ffa76d7a66dbb4bf165ebbd65106553a89e9f.tar.gz
cbt-9a4ffa76d7a66dbb4bf165ebbd65106553a89e9f.tar.bz2
cbt-9a4ffa76d7a66dbb4bf165ebbd65106553a89e9f.zip
minor cleanup
-rw-r--r--compatibility/BuildInterface.java1
-rw-r--r--stage2/Lib.scala2
-rw-r--r--stage2/ToolsTasks.scala1
3 files changed, 1 insertions, 3 deletions
diff --git a/compatibility/BuildInterface.java b/compatibility/BuildInterface.java
index fea43be..636ded9 100644
--- a/compatibility/BuildInterface.java
+++ b/compatibility/BuildInterface.java
@@ -3,7 +3,6 @@ import java.io.*;
public interface BuildInterface extends Dependency{
public abstract BuildInterface copy(Context context); // needed to configure builds
- public abstract String show(); // needed for debugging
public abstract String scalaVersion(); // needed to propagate scalaVersion to dependent builds
public abstract String[] crossScalaVersionsArray(); // FIXME: this probably can't use Scala classes
public abstract BuildInterface finalBuild(); // needed to propagage through build builds. Maybe we can get rid of this.
diff --git a/stage2/Lib.scala b/stage2/Lib.scala
index 2c85821..dd0c23e 100644
--- a/stage2/Lib.scala
+++ b/stage2/Lib.scala
@@ -393,7 +393,7 @@ final class Lib(logger: Logger) extends Stage1Lib(logger) with Scaffold{
def uploadAll(url: URL, nameAndContents: Seq[(String, Array[Byte])], credentials: String ): Unit =
- nameAndContents.map{ case(name, content) => upload(name, content, url, credentials: String ) }
+ nameAndContents.map{ case(name, content) => upload(name, content, url, credentials ) }
def upload(fileName: String, fileContents: Array[Byte], baseUrl: URL, credentials: String): Unit = {
import java.net._
diff --git a/stage2/ToolsTasks.scala b/stage2/ToolsTasks.scala
index c39c373..7a95dad 100644
--- a/stage2/ToolsTasks.scala
+++ b/stage2/ToolsTasks.scala
@@ -38,7 +38,6 @@ class ToolsTasks(
def amm = ammonite
def ammonite = {
val version = args.lift(1).getOrElse(constants.scalaVersion)
- val scalac = new ScalaCompilerDependency( cbtHasChanged,mavenCache, version )
val d = Resolver(mavenCentral).bindOne(
MavenDependency(
"com.lihaoyi","ammonite-repl_2.11.7",args.lift(1).getOrElse("0.5.7")