backport changes to 2.11

Author: rssh

build.sbt

@@ -4,6 +4,7 @@ name:="scala-gopher"
 organization:="com.github.rssh"
 
 scalaVersion := "2.12.0"
+crossScalaVersions := Seq("2.11.8", "2.12.0")
 
 resolvers += Resolver.sonatypeRepo("snapshots")
 

src/main/scala/gopher/util/MacroUtil.scala

@@ -109,9 +109,14 @@ object MacroUtil
 
   def cleanUntypecheck(c:Context)(tree:c.Tree):c.Tree =
   {
-    removeAsyncStateMachineResultDefDef(c)(c.untypecheck(tree))
+    if (isScala2_11) {
+      c.untypecheck(tree)
+    } else {
+      removeAsyncStateMachineResultDefDef(c)(c.untypecheck(tree))
+    }
   }
 
+  val isScala2_11 = util.Properties.versionNumberString.startsWith("2.11.")
 
   final val SHORT_LEN = 80
 }

src/main/scala/gopher/util/ReflectUtil.scala

@@ -16,11 +16,11 @@ object ReflectUtil
      val retval = ownerType.members.filter(_.isTerm).map(_.asTerm).filter{ x =>
                          if (x.isVal) {
                             // in scala 2.12 getter method type, scala 2.11 - type
-                            val r = x.typeSignature match {
-                              case u.NullaryMethodType(rt) => rt <:< u.typeOf[T] // for scala-2.12
-                              case _ => (x.typeSignature <:< u.typeOf[T])   // for scala-2.11
-                            }
-                            r
+                              val r = x.typeSignature match {
+                                case u.NullaryMethodType(rt) => rt <:< u.typeOf[T] // for scala-2.12
+                                case _ => (x.typeSignature <:< u.typeOf[T])   // for scala-2.11
+                              }
+                              r
                          } else false
      }.toList
      retval