diff options
| author | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2017-04-11 09:12:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-11 09:12:40 -0400 |
| commit | 7fe1d16adef09f1a2a7c1c65bf064567224172d7 (patch) | |
| tree | bc4a28d4da3c9100fd1e4a40adbede6a186e341d | |
| parent | 63f57fbce89c44a9560aa9f45c5a859764eca490 (diff) | |
| parent | 1f439c57594ad144e152fea7f19cca5a71c9fe4b (diff) | |
| download | cbt-7fe1d16adef09f1a2a7c1c65bf064567224172d7.tar.gz cbt-7fe1d16adef09f1a2a7c1c65bf064567224172d7.tar.bz2 cbt-7fe1d16adef09f1a2a7c1c65bf064567224172d7.zip | |
Merge pull request #487 from atvictor/master
Fix ScalaPB options definition
| -rw-r--r-- | plugins/scalapb/ScalaPB.scala | 10 |
1 files 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 ) |