From 1f439c57594ad144e152fea7f19cca5a71c9fe4b Mon Sep 17 00:00:00 2001
From: Victor Pirat <victor.pirat@iadvize.com>
Date: Tue, 11 Apr 2017 14:35:34 +0200
Subject: fix scalapb options definition

---
 plugins/scalapb/ScalaPB.scala | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/scalapb/ScalaPB.scala b/plugins/scalapb/ScalaPB.scala
index e514476..f3e8b8c 100644
--- a/plugins/scalapb/ScalaPB.scala
+++ b/plugins/scalapb/ScalaPB.scala
@@ -41,11 +41,11 @@ object Scalapb{
       def apply = {
         output.mkdirs
         val protoFiles = input.listRecursive.filter(_.isFile).map(_.string).toArray
-        Seq(
-          javaConversions.option("javaConversions"),
+        val options = Seq(
+          javaConversions.option("java_conversions"),
           grpc.option("grpc"),
-          singleLineToString.option("singleLineToString"),
-          flatPackage.option("flatPackage")
+          singleLineToString.option("single_line_to_string"),
+          flatPackage.option("flat_package")
         ).flatten.mkString(",")
         import _root_.protocbridge.frontend.PluginFrontend
         val pluginFrontend: PluginFrontend = PluginFrontend.newInstance()
@@ -57,7 +57,7 @@ object Scalapb{
                 Array(
                   "-" ++ version.getClass.getSimpleName.stripSuffix("$"),
                   "-I=" ++ input.string,
-                  "--scala_out=" ++ output.string,
+                  s"--scala_out=$options:" ++ output.string,
                   s"--plugin=protoc-gen-scala=${scriptPath}"
                 ) ++ protoFiles
               )
-- 
cgit v1.2.3