Merge pull request #3218 from eed3si9n/wip/restligeist

Fix restligeist macro

build.sbt

@@ -396,7 +396,8 @@ def allProjects =
     mainSettingsProj,
     mainProj,
     sbtProj,
-    bundledLauncherProj
+    bundledLauncherProj,
+    coreMacrosProj
   )
 
 lazy val nonRoots = allProjects.map(p => LocalProject(p.id))

core-macros/src/main/scala/sbt/internal/util/appmacro/ContextUtil.scala

@@ -27,6 +27,7 @@ object ContextUtil {
     import c.universe._
     c.macroApplication match {
       case s @ Select(Apply(_, t :: Nil), tp) => f(c.Expr[Any](t), s.pos)
+      case a @ Apply(_, t :: Nil)             => f(c.Expr[Any](t), a.pos)
       case x                                  => unexpectedTree(x)
     }
   }

main-settings/src/main/scala/sbt/std/TaskMacro.scala

@@ -82,12 +82,12 @@ object TaskMacro {
   final val InputTaskCreateDynName = "createDyn"
   final val InputTaskCreateFreeName = "createFree"
   final val append1Migration =
-    "`<+=` operator is deprecated. Try `lhs += { x.value }`\n  or see http://www.scala-sbt.org/0.13/docs/Migrating-from-sbt-012x.html."
+    "`<+=` operator is removed. Try `lhs += { x.value }`\n  or see http://www.scala-sbt.org/1.0/docs/Migrating-from-sbt-012x.html."
   final val appendNMigration =
-    "`<++=` operator is deprecated. Try `lhs ++= { x.value }`\n  or see http://www.scala-sbt.org/0.13/docs/Migrating-from-sbt-012x.html."
+    "`<++=` operator is removed. Try `lhs ++= { x.value }`\n  or see http://www.scala-sbt.org/1.0/docs/Migrating-from-sbt-012x.html."
   final val assignMigration =
-    """`<<=` operator is deprecated. Use `key := { x.value }` or `key ~= (old => { newValue })`.
-      |See http://www.scala-sbt.org/0.13/docs/Migrating-from-sbt-012x.html""".stripMargin
+    """`<<=` operator is removed. Use `key := { x.value }` or `key ~= (old => { newValue })`.
+      |See http://www.scala-sbt.org/1.0/docs/Migrating-from-sbt-012x.html""".stripMargin
 
   import LinterDSL.{ Empty => EmptyLinter }