From 293ae706f54535ab226f15b0e26f0ec185c931af Mon Sep 17 00:00:00 2001 From: jvican Date: Mon, 1 May 2017 18:23:12 +0200 Subject: [PATCH] Fix #3160: Make actions/task-cancel compile --- sbt/src/sbt-test/actions/task-cancel/build.sbt | 10 +++++----- .../sbt-test/actions/task-cancel/project/Build.scala | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sbt/src/sbt-test/actions/task-cancel/build.sbt b/sbt/src/sbt-test/actions/task-cancel/build.sbt index 149e93163..334fa825d 100644 --- a/sbt/src/sbt-test/actions/task-cancel/build.sbt +++ b/sbt/src/sbt-test/actions/task-cancel/build.sbt @@ -1,9 +1,9 @@ import sbt.ExposeYourself._ -taskCancelHandler := { (state: State) => - new TaskEvaluationCancelHandler { +taskCancelStrategy := { (state: State) => + new TaskCancellationStrategy { type State = Unit - override def onTaskEngineStart(canceller: TaskCancel): Unit = canceller.cancel() - override def finish(result: Unit): Unit = () + override def onTaskEngineStart(canceller: RunningTaskEngine): Unit = canceller.cancelAndShutdown() + override def onTaskEngineFinish(state: State): Unit = () } -} \ No newline at end of file +} diff --git a/sbt/src/sbt-test/actions/task-cancel/project/Build.scala b/sbt/src/sbt-test/actions/task-cancel/project/Build.scala index cd7055cf0..33011f1fb 100644 --- a/sbt/src/sbt-test/actions/task-cancel/project/Build.scala +++ b/sbt/src/sbt-test/actions/task-cancel/project/Build.scala @@ -1,5 +1,5 @@ package sbt // this API is private[sbt], so only exposed for trusted clients and folks who like breaking. object ExposeYourself { - val taskCancelHandler = sbt.Keys.taskCancelHandler -} \ No newline at end of file + val taskCancelStrategy = sbt.Keys.taskCancelStrategy +}