Permalink
Browse files

fix inputTask construction method and put sbt package object in prope…

…r directory
  • Loading branch information...
1 parent e374554 commit f388b07632bbb916c31751eabeceee3e8397dc9a @harrah committed Dec 10, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 main/settings/src/main/scala/sbt/Def.scala
  2. +1 −1 sbt/src/main/scala/{object → }/package.scala
@@ -68,7 +68,7 @@ object Def extends Init[Scope] with TaskMacroExtra
import language.experimental.macros
def settingKey[T](description: String): SettingKey[T] = macro std.KeyMacro.settingKeyImpl[T]
def taskKey[T](description: String): TaskKey[T] = macro std.KeyMacro.taskKeyImpl[T]
- def inputKey[T](description: String): TaskKey[T] = macro std.KeyMacro.taskKeyImpl[T]
+ def inputKey[T](description: String): InputKey[T] = macro std.KeyMacro.inputKeyImpl[T]
}
// these need to be mixed into the sbt package object because the target doesn't involve Initialize or anything in Def
trait TaskMacroExtra
@@ -54,5 +54,5 @@ package object sbt extends sbt.std.TaskExtra with sbt.Types with sbt.ProcessExtr
import language.experimental.macros
def settingKey[T](description: String): SettingKey[T] = macro std.KeyMacro.settingKeyImpl[T]
def taskKey[T](description: String): TaskKey[T] = macro std.KeyMacro.taskKeyImpl[T]
- def inputKey[T](description: String): TaskKey[T] = macro std.KeyMacro.taskKeyImpl[T]
+ def inputKey[T](description: String): InputKey[T] = macro std.KeyMacro.inputKeyImpl[T]
}

0 comments on commit f388b07

Please sign in to comment.