fix test

Author: changvvb

pbconverts/src/main/scala-2.12/pbconverts/ScalableImplicits.scala

@@ -9,9 +9,9 @@ trait ScalableImplicits {
 
   // java.lang.Iterable[M] => That[T]
   implicit def iterableScalable[That[_], S, P](implicit
-      scalable: Scalable[T, M],
+      scalable: Scalable[S, P],
       bf: CanBuildFrom[Nothing, S, That[S]]
-  ): Scalable[That[T], java.lang.Iterable[M]] =
+  ): Scalable[That[S], java.lang.Iterable[P]] =
     Scalable { proto ⇒
       proto.asScala.map(scalable.toScala).to[That]
     }
@@ -20,8 +20,8 @@ trait ScalableImplicits {
     Scalable { proto ⇒ proto.asScala.to[That] }
 
   // Repr[M] => That[T]
-  implicit def iterableSelfScalable[That, Repr <: TraversableLike[M, Repr], S, P](implicit
-      scalable: Scalable[T, M],
+  implicit def iterableSelfScalable[That, Repr <: TraversableLike[P, Repr], S, P](implicit
+      scalable: Scalable[S, P],
       bf: CanBuildFrom[Repr, S, That]
   ): Scalable[That, Repr] = { proto ⇒
     proto.map(scalable.toScala)

pbconverts/src/main/scala/pbconverts/Protoable.scala

@@ -14,10 +14,7 @@ object Protoable {
 
   def apply[S <: Product, P]: Protoable[S, P] = macro ProtoScalableMacro.protosImpl[S, P]
 
-  def apply[S, P](f: S ⇒ P): Protoable[S, P] =
-    new Protoable[S, P] {
-      override def toProto(entity: S): P = f(entity)
-    }
+  def apply[S, P](convert: S ⇒ P): Protoable[S, P] = x => convert(x)
 
   implicit val javaDoubleProtoable = Protoable[Double, java.lang.Double](_.toDouble)
   implicit val javaFloatProtoable = Protoable[Float, java.lang.Float](_.toFloat)

pbconverts/src/main/scala/pbconverts/Scalable.scala

@@ -15,10 +15,7 @@ object Scalable extends ScalableImplicits {
 
   def apply[S <: Product, P]: Scalable[S, P] = macro ProtoScalableMacro.scalasImpl[S, P]
 
-  def apply[S, P](convert: P ⇒ S): Scalable[S, P] =
-    new Scalable[S, P] {
-      override def toScala(proto: P): S = convert(proto)
-    }
+  def apply[S, P](convert: P ⇒ S): Scalable[S, P] = x => convert(x)
 
   implicit val javaIntegerScalable = Scalable[Int, java.lang.Integer](_.toInt)
   implicit val javaLongScalable = Scalable[Long, java.lang.Long](_.toLong)

project/build.properties

@@ -1 +1 @@
-sbt.version = 1.5.4
+sbt.version = 1.4.7