Merge pull request #60 from xuwei-k/remove-javaConversions-grpc

remove `javaConversions = true` when grpc
scalapb · Dec 3, 2015 · cc1f2e4 · cc1f2e4
2 parents ccf74c2 + 8c03dd6
commit cc1f2e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/compiler-plugin/src/main/scala/com/trueaccord/scalapb/compiler/ProtobufGenerator.scala b/compiler-plugin/src/main/scala/com/trueaccord/scalapb/compiler/ProtobufGenerator.scala
@@ -997,7 +997,7 @@ object ProtobufGenerator {
     params.split(",").map(_.trim).filter(_.nonEmpty).foldLeft[Either[String, GeneratorParams]](Right(GeneratorParams())) {
       case (Right(params), "java_conversions") => Right(params.copy(javaConversions = true))
       case (Right(params), "flat_package") => Right(params.copy(flatPackage = true))
-      case (Right(params), "grpc") => Right(params.copy(grpc = true, javaConversions = true))
+      case (Right(params), "grpc") => Right(params.copy(grpc = true))
       case (Right(params), p) => Left(s"Unrecognized parameter: '$p'")
       case (x, _) => x
     }

diff --git a/e2e/build.sbt b/e2e/build.sbt
@@ -59,7 +59,7 @@ PB.protocOptions in PB.protobufConfig := {
   val conf = (PB.generatedTargets in PB.protobufConfig).value
   val scalaOpts = conf.find(_._2.endsWith(".scala")) match {
     case Some(targetForScala) =>
-      Seq(s"--scala_out=grpc:${targetForScala._1.absolutePath}")
+      Seq(s"--scala_out=grpc,java_conversions:${targetForScala._1.absolutePath}")
     case None =>
       Nil
   }