Pass '--include_std_types' to plugin-tester sbt projects

akka · Oct 6, 2020 · 76ce3e9 · 76ce3e9
1 parent 063bb4b
commit 76ce3e9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/build.sbt b/build.sbt
@@ -213,7 +213,8 @@ lazy val pluginTesterScala = Project(id = "akka-grpc-plugin-tester-scala", base
     skip in publish := true,
     crossScalaVersions := Dependencies.Versions.CrossScalaForLib,
     scalaVersion := scala212,
-    ReflectiveCodeGen.codeGeneratorSettings ++= Seq("flat_package", "server_power_apis"))
+    ReflectiveCodeGen.codeGeneratorSettings ++= Seq("flat_package", "server_power_apis"),
+    Compile / ReflectiveCodeGen.protocOptions += "--include_std_types")
   .pluginTestingSettings
 
 lazy val pluginTesterJava = Project(id = "akka-grpc-plugin-tester-java", base = file("plugin-tester-java"))
@@ -224,7 +225,8 @@ lazy val pluginTesterJava = Project(id = "akka-grpc-plugin-tester-java", base =
     ReflectiveCodeGen.generatedLanguages := Seq("Java"),
     crossScalaVersions := Dependencies.Versions.CrossScalaForLib,
     scalaVersion := scala212,
-    ReflectiveCodeGen.codeGeneratorSettings ++= Seq("server_power_apis"))
+    ReflectiveCodeGen.codeGeneratorSettings ++= Seq("server_power_apis"),
+    Compile / ReflectiveCodeGen.protocOptions += "--include_std_types")
   .pluginTestingSettings
 
 lazy val root = Project(id = "akka-grpc", base = file("."))

diff --git a/project/ReflectiveCodeGen.scala b/project/ReflectiveCodeGen.scala
@@ -84,6 +84,7 @@ object ReflectiveCodeGen extends AutoPlugin {
       generatedLanguages in Global := Seq("Scala"),
       generatedSources in Global := Seq("Client", "Server"),
       extraGenerators in Global := Seq.empty,
+      protocOptions in Global := Seq.empty,
       watchSources ++= (watchSources in ProjectRef(file("."), "akka-grpc-codegen")).value,
       watchSources ++= (watchSources in ProjectRef(file("."), "sbt-akka-grpc")).value)