From f388b07632bbb916c31751eabeceee3e8397dc9a Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Sun, 9 Dec 2012 20:40:41 -0500 Subject: [PATCH] fix inputTask construction method and put sbt package object in proper directory --- main/settings/src/main/scala/sbt/Def.scala | 2 +- sbt/src/main/scala/{object => }/package.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename sbt/src/main/scala/{object => }/package.scala (96%) diff --git a/main/settings/src/main/scala/sbt/Def.scala b/main/settings/src/main/scala/sbt/Def.scala index 3589dedaa..37a19bef5 100644 --- a/main/settings/src/main/scala/sbt/Def.scala +++ b/main/settings/src/main/scala/sbt/Def.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 diff --git a/sbt/src/main/scala/object/package.scala b/sbt/src/main/scala/package.scala similarity index 96% rename from sbt/src/main/scala/object/package.scala rename to sbt/src/main/scala/package.scala index cf99aea6e..c820cbae6 100644 --- a/sbt/src/main/scala/object/package.scala +++ b/sbt/src/main/scala/package.scala @@ -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] }