Skip to content
This repository was archived by the owner on May 3, 2018. It is now read-only.

rename PartestTask to SbtPartestTask and bump versions #4

Merged
merged 2 commits into from
Oct 17, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: scala
script:
- sbt ++$TRAVIS_SCALA_VERSION compile
scala:
- 2.11.0-SNAPSHOT
- 2.11.2
jdk:
- openjdk6
- openjdk7
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
scalaModuleSettings

version := "0.3.0-SNAPSHOT"
version := "0.5-SNAPSHOT"

scalaVersion := "2.11.0-M8"
scalaVersion := "2.11.2"

snapshotScalaBinaryVersion := "2.11.0-M8"
snapshotScalaBinaryVersion := "2.11.2"

// dependencies:
libraryDependencies += "org.scala-sbt" % "test-interface" % "1.0"
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.1
sbt.version=0.13.6
4 changes: 2 additions & 2 deletions src/main/scala/tools/partest/TestingInterface.scala
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ case class Runner(args: Array[String], remoteArgs: Array[String], testClassLoade
* @return an array of <code>Task</code>s
* @throws IllegalStateException if invoked after <code>done</code> has been invoked.
*/
def tasks(taskDefs: Array[TaskDef]): Array[sbt.testing.Task] = taskDefs map (PartestTask(_): sbt.testing.Task)
def tasks(taskDefs: Array[TaskDef]): Array[sbt.testing.Task] = taskDefs map (SbtPartestTask(_): sbt.testing.Task)

/** Indicates the client is done with this <code>Runner</code> instance.
*
Expand All @@ -62,7 +62,7 @@ case class Runner(args: Array[String], remoteArgs: Array[String], testClassLoade
*
* TODO: make configurable
*/
case class PartestTask(taskDef: TaskDef) extends Task {
case class SbtPartestTask(taskDef: TaskDef) extends Task {
/** Executes this task, possibly returning to the client new tasks to execute. */
def execute(eventHandler: EventHandler, loggers: Array[Logger]): Array[Task] = {
val forkedCp = scala.util.Properties.javaClassPath
Expand Down