scalapb 0.7.0 (#23)

Author: xuwei-k

build.sbt

@@ -1,4 +1,4 @@
-import com.trueaccord.scalapb.compiler.Version.{grpcJavaVersion, scalapbVersion}
+import scalapb.compiler.Version.{grpcJavaVersion, scalapbVersion}
 
 organization in ThisBuild := "beyondthelines"
 version in ThisBuild := "0.0.8"
@@ -12,9 +12,9 @@ lazy val runtime = (project in file("runtime"))
     crossScalaVersions := Seq("2.12.4", "2.11.11"),
     name := "GrpcGatewayRuntime",
     libraryDependencies ++= Seq(
-      "com.trueaccord.scalapb" %% "compilerplugin"          % scalapbVersion,
-      "com.trueaccord.scalapb" %% "scalapb-runtime-grpc"    % scalapbVersion,
-      "com.trueaccord.scalapb" %% "scalapb-json4s"          % "0.3.3",
+      "com.thesamet.scalapb"   %% "compilerplugin"          % scalapbVersion,
+      "com.thesamet.scalapb"   %% "scalapb-runtime-grpc"    % scalapbVersion,
+      "com.thesamet.scalapb"   %% "scalapb-json4s"          % "0.7.0",
       "io.grpc"                %  "grpc-netty"              % grpcJavaVersion,
       "org.webjars"            %  "swagger-ui"              % "3.5.0",
       "com.google.api.grpc"    % "googleapis-common-protos" % "0.0.3" % "protobuf"
@@ -35,8 +35,8 @@ lazy val generator = (project in file("generator"))
     crossScalaVersions := Seq("2.12.4", "2.10.6"),
     name := "GrpcGatewayGenerator",
     libraryDependencies ++= Seq(
-      "com.trueaccord.scalapb" %% "compilerplugin"          % scalapbVersion,
-      "com.trueaccord.scalapb" %% "scalapb-runtime-grpc"    % scalapbVersion,
+      "com.thesamet.scalapb"   %% "compilerplugin"          % scalapbVersion,
+      "com.thesamet.scalapb"   %% "scalapb-runtime-grpc"    % scalapbVersion,
       "com.google.api.grpc"    % "googleapis-common-protos" % "0.0.3" % "protobuf"
     ),
     PB.protoSources in Compile += target.value / "protobuf_external",

generator/src/main/scala/grpcgateway/generators/GatewayGenerator.scala

@@ -6,15 +6,15 @@ import com.google.protobuf.Descriptors.FieldDescriptor.JavaType
 import com.google.protobuf.Descriptors._
 import com.google.protobuf.ExtensionRegistry
 import com.google.protobuf.compiler.PluginProtos.{CodeGeneratorRequest, CodeGeneratorResponse}
-import com.trueaccord.scalapb.compiler.FunctionalPrinter.PrinterEndo
-import com.trueaccord.scalapb.compiler.{DescriptorPimps, FunctionalPrinter}
+import scalapb.compiler.FunctionalPrinter.PrinterEndo
+import scalapb.compiler.{DescriptorPimps, FunctionalPrinter}
 
 import scala.collection.JavaConverters._
-import scalapbshade.v0_6_7.com.trueaccord.scalapb.Scalapb
+import scalapb.options.compiler.Scalapb
 
 object GatewayGenerator extends protocbridge.ProtocCodeGenerator with DescriptorPimps {
 
-  override val params = com.trueaccord.scalapb.compiler.GeneratorParams()
+  override val params = scalapb.compiler.GeneratorParams()
 
   override def run(requestBytes: Array[Byte]): Array[Byte] = {
     val registry = ExtensionRegistry.newInstance()
@@ -48,8 +48,8 @@ object GatewayGenerator extends protocbridge.ProtocCodeGenerator with Descriptor
       .add(s"package ${fileDesc.scalaPackageName}")
       .newline
       .add(
-        "import _root_.com.trueaccord.scalapb.GeneratedMessage",
-        "import _root_.com.trueaccord.scalapb.json.JsonFormat",
+        "import _root_.scalapb.GeneratedMessage",
+        "import _root_.scalapb.json4s.JsonFormat",
         "import _root_.grpcgateway.handlers._",
         "import _root_.io.grpc._",
         "import _root_.io.netty.handler.codec.http.{HttpMethod, QueryStringDecoder}"
@@ -58,7 +58,7 @@ object GatewayGenerator extends protocbridge.ProtocCodeGenerator with Descriptor
       .add(
         "import scala.collection.JavaConverters._",
         "import scala.concurrent.{ExecutionContext, Future}",
-        "import com.trueaccord.scalapb.json.JsonFormatException",
+        "import scalapb.json4s.JsonFormatException",
         "import scala.util._"
       )
       .newline

generator/src/main/scala/grpcgateway/generators/SwaggerGenerator.scala

@@ -6,16 +6,16 @@ import com.google.protobuf.Descriptors.FieldDescriptor.JavaType
 import com.google.protobuf.Descriptors.{Descriptor, FieldDescriptor, FileDescriptor, MethodDescriptor}
 import com.google.protobuf.ExtensionRegistry
 import com.google.protobuf.compiler.PluginProtos.{CodeGeneratorRequest, CodeGeneratorResponse}
-import com.trueaccord.scalapb.compiler.FunctionalPrinter.PrinterEndo
-import com.trueaccord.scalapb.compiler.{DescriptorPimps, FunctionalPrinter}
+import scalapb.compiler.FunctionalPrinter.PrinterEndo
+import scalapb.compiler.{DescriptorPimps, FunctionalPrinter}
 
 import scala.collection.JavaConverters._
 import scala.collection.mutable
-import scalapbshade.v0_6_7.com.trueaccord.scalapb.Scalapb
+import scalapb.options.compiler.Scalapb
 
 object SwaggerGenerator extends protocbridge.ProtocCodeGenerator with DescriptorPimps {
 
-  override val params = com.trueaccord.scalapb.compiler.GeneratorParams()
+  override val params = scalapb.compiler.GeneratorParams()
 
   override def run(requestBytes: Array[Byte]): Array[Byte] = {
     val registry = ExtensionRegistry.newInstance()

project/protoc.sbt

@@ -1,5 +1,5 @@
-addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.13")
+addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.15")
 
 libraryDependencies ++= Seq(
-  "com.trueaccord.scalapb" %% "compilerplugin" % "0.6.7"
+  "com.thesamet.scalapb" %% "compilerplugin" % "0.7.0"
 )

runtime/src/main/scala/grpcgateway/handlers/GrpcGatewayHandler.scala

@@ -2,8 +2,8 @@ package grpcgateway.handlers
 
 import java.nio.charset.StandardCharsets
 
-import com.trueaccord.scalapb.GeneratedMessage
-import com.trueaccord.scalapb.json.JsonFormat
+import scalapb.GeneratedMessage
+import scalapb.json4s.JsonFormat
 import io.grpc.ManagedChannel
 import io.netty.channel.ChannelHandler.Sharable
 import io.netty.channel.{ ChannelFutureListener, ChannelHandlerContext, ChannelInboundHandlerAdapter }

runtime/src/main/scala/grpcgateway/handlers/package.scala

@@ -2,7 +2,7 @@ package grpcgateway
 
 import java.nio.charset.StandardCharsets
 
-import com.trueaccord.scalapb.json.JsonFormatException
+import scalapb.json4s.JsonFormatException
 import io.grpc.Status.Code
 import io.netty.buffer.Unpooled
 import io.netty.handler.codec.http._