Skip to content

Upgrade versions #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
btlines wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade versions #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import scalapb.compiler.Version.{grpcJavaVersion, scalapbVersion}

scalaVersion := "2.12.4"

resolvers += Resolver.bintrayRepo("beyondthelines", "maven")
Expand All @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sbt.version=1.0.4
sbt.version=1.1.1

10 changes: 5 additions & 5 deletions project/protoc.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)

2 changes: 1 addition & 1 deletion src/main/scala/io/grpc/routeguide/RouteGuidePersistence.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down