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

Commit e9b3200

Browse files
committed
Merge pull request #4 from gourlaysama/wip/partest-task
rename PartestTask to SbtPartestTask and bump versions
2 parents 544fe98 + 4994667 commit e9b3200

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ language: scala
22
script:
33
- sbt ++$TRAVIS_SCALA_VERSION compile
44
scala:
5-
- 2.11.0-SNAPSHOT
5+
- 2.11.2
66
jdk:
77
- openjdk6
88
- openjdk7

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
scalaModuleSettings
22

3-
version := "0.3.0-SNAPSHOT"
3+
version := "0.5-SNAPSHOT"
44

5-
scalaVersion := "2.11.0-M8"
5+
scalaVersion := "2.11.2"
66

7-
snapshotScalaBinaryVersion := "2.11.0-M8"
7+
snapshotScalaBinaryVersion := "2.11.2"
88

99
// dependencies:
1010
libraryDependencies += "org.scala-sbt" % "test-interface" % "1.0"

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.1
1+
sbt.version=0.13.6

src/main/scala/tools/partest/TestingInterface.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ case class Runner(args: Array[String], remoteArgs: Array[String], testClassLoade
4949
* @return an array of <code>Task</code>s
5050
* @throws IllegalStateException if invoked after <code>done</code> has been invoked.
5151
*/
52-
def tasks(taskDefs: Array[TaskDef]): Array[sbt.testing.Task] = taskDefs map (PartestTask(_): sbt.testing.Task)
52+
def tasks(taskDefs: Array[TaskDef]): Array[sbt.testing.Task] = taskDefs map (SbtPartestTask(_): sbt.testing.Task)
5353

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

0 commit comments

Comments
 (0)