From 9635ca2a022de442f3a587fe81d3a8049af3659a Mon Sep 17 00:00:00 2001 From: damien Date: Thu, 1 Mar 2018 10:07:19 +0000 Subject: [PATCH] Upgrade versions - scalapb 0.7.0 - grpcakkastream 0.0.9 - grpcmonix 0.0.7 - grpcgateway 0.0.9 --- build.sbt | 18 +++++++++--------- project/build.properties | 2 +- project/protoc.sbt | 10 +++++----- .../routeguide/RouteGuidePersistence.scala | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build.sbt b/build.sbt index 6678f00..99be1f8 100644 --- a/build.sbt +++ b/build.sbt @@ -1,3 +1,5 @@ +import scalapb.compiler.Version.{grpcJavaVersion, scalapbVersion} + scalaVersion := "2.12.4" resolvers += Resolver.bintrayRepo("beyondthelines", "maven") @@ -14,21 +16,19 @@ PB.targets in Compile := Seq( grpc.akkastreams.generators.GrpcAkkaStreamGenerator() -> (sourceManaged in Compile).value ) -val scalapbVersion = com.trueaccord.scalapb.compiler.Version.scalapbVersion - libraryDependencies ++= Seq( - "com.trueaccord.scalapb" %% "scalapb-runtime" % scalapbVersion % "protobuf", + "com.thesamet.scalapb" %% "scalapb-runtime" % scalapbVersion % "protobuf", // for gRPC - "io.grpc" % "grpc-netty" % "1.8.0", - "com.trueaccord.scalapb" %% "scalapb-runtime-grpc" % scalapbVersion, + "io.grpc" % "grpc-netty" % grpcJavaVersion, + "com.thesamet.scalapb" %% "scalapb-runtime-grpc" % scalapbVersion, // for JSON conversion - "com.trueaccord.scalapb" %% "scalapb-json4s" % "0.3.0", + "com.thesamet.scalapb" %% "scalapb-json4s" % scalapbVersion, // for GRPC Gateway - "beyondthelines" %% "grpcgatewayruntime" % "0.0.6" % "compile,protobuf", + "beyondthelines" %% "grpcgatewayruntime" % "0.0.9" % "compile,protobuf", // for GRPC Monix - "beyondthelines" %% "grpcmonixruntime" % "0.0.5", + "beyondthelines" %% "grpcmonixruntime" % "0.0.7", // for GRPC Akkastream - "beyondthelines" %% "grpcakkastreamruntime" % "0.0.5" + "beyondthelines" %% "grpcakkastreamruntime" % "0.0.9" ) scalacOptions in ThisBuild ++= Seq("-unchecked", "-deprecation") diff --git a/project/build.properties b/project/build.properties index cd928ea..7acdfb6 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,2 +1,2 @@ -sbt.version=1.0.4 +sbt.version=1.1.1 diff --git a/project/protoc.sbt b/project/protoc.sbt index 1810403..f7f8048 100644 --- a/project/protoc.sbt +++ b/project/protoc.sbt @@ -1,11 +1,11 @@ -addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.13") +addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.17") resolvers += Resolver.bintrayRepo("beyondthelines", "maven") libraryDependencies ++= Seq( - "com.trueaccord.scalapb" %% "compilerplugin" % "0.6.7", - "beyondthelines" %% "grpcgatewaygenerator" % "0.0.6", - "beyondthelines" %% "grpcmonixgenerator" % "0.0.5", - "beyondthelines" %% "grpcakkastreamgenerator" % "0.0.5" + "com.thesamet.scalapb" %% "compilerplugin" % "0.7.0", + "beyondthelines" %% "grpcgatewaygenerator" % "0.0.9", + "beyondthelines" %% "grpcmonixgenerator" % "0.0.7", + "beyondthelines" %% "grpcakkastreamgenerator" % "0.0.9" ) diff --git a/src/main/scala/io/grpc/routeguide/RouteGuidePersistence.scala b/src/main/scala/io/grpc/routeguide/RouteGuidePersistence.scala index 8a65c9f..d15e621 100644 --- a/src/main/scala/io/grpc/routeguide/RouteGuidePersistence.scala +++ b/src/main/scala/io/grpc/routeguide/RouteGuidePersistence.scala @@ -3,7 +3,7 @@ package io.grpc.routeguide import java.net.URL import java.util.logging.Logger -import com.trueaccord.scalapb.json.JsonFormat +import scalapb.json4s.JsonFormat import scala.io.Source