Skip to content
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.

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

Updates build and Releases 0.7.0 #115

Merged
merged 2 commits into from
Jan 10, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions modules/internal/src/main/scala/service.scala
Original file line number Diff line number Diff line change
Expand Up @@ -273,16 +273,16 @@ private[internal] object utils {
// format: OFF
def buildRequests(algName: Type.Name, typeParam: Type.Param, stats: List[Stat]): List[RPCRequest] = stats.collect {
case q"@rpc($s) @stream[ResponseStreaming.type] def $name[..$tparams]($request): $typeParam[Observable[$response]]" =>
RPCRequest(algName, name, utils.serializationType(s), Some(ResponseStreaming), paramTpe(request), response)
Option(RPCRequest(algName, name, utils.serializationType(s), Some(ResponseStreaming), paramTpe(request), response))
case q"@rpc($s) @stream[RequestStreaming.type] def $name[..$tparams]($paranName: Observable[$request]): $typeParam[$response]" =>
RPCRequest(algName, name, utils.serializationType(s), Some(RequestStreaming), request, response)
Option(RPCRequest(algName, name, utils.serializationType(s), Some(RequestStreaming), request, response))
case q"@rpc($s) @stream[BidirectionalStreaming.type] def $name[..$tparams]($paranName: Observable[$request]): $typeParam[Observable[$response]]" =>
RPCRequest(algName, name, utils.serializationType(s), Some(BidirectionalStreaming), request, response)
Option(RPCRequest(algName, name, utils.serializationType(s), Some(BidirectionalStreaming), request, response))
case q"@rpc($s) def $name[..$tparams]($request): $typeParam[$response]" =>
RPCRequest(algName, name, utils.serializationType(s), None, paramTpe(request), response)
Option(RPCRequest(algName, name, utils.serializationType(s), None, paramTpe(request), response))
case e =>
throw new MatchError("Unmatched rpc method: " + e.toString())
}
None
}.flatten
// format: ON

private[internal] def methodType(s: Option[StreamingType]): Term.Select = s match {
Expand Down
3 changes: 2 additions & 1 deletion modules/server/src/test/scala/TaglessUtils.scala
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@ import freestyle.free._
import freestyle.free.asyncCatsEffect.implicits._
import freestyle.rpc.common._
import freestyle.rpc.protocol._
import freestyle.tagless.tagless
import monix.eval.Task
import monix.reactive.Observable

object TaglessUtils extends CommonUtils {

object service {

@freestyle.tagless.tagless
@tagless
@service
trait TaglessRPCService {

Expand Down
4 changes: 2 additions & 2 deletions project/ProjectPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ object ProjectPlugin extends AutoPlugin {

lazy val V = new {
val avro4s: String = "1.8.0"
val frees: String = "0.5.1"
val frees: String = "0.5.2"
val grpc: String = "1.7.1"
val pbdirect: String = "0.0.8"
val scalameta: String = "1.8.0"
Expand Down Expand Up @@ -56,7 +56,7 @@ object ProjectPlugin extends AutoPlugin {
%("grpc-stub", V.grpc),
%%("monix"),
%%("pbdirect", V.pbdirect),
"com.sksamuel.avro4s" %% "avro4s-core" % V.avro4s,
%%("avro4s", V.avro4s),
%("grpc-testing", V.grpc) % Test,
%%("scalamockScalatest") % Test
)
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
resolvers += Resolver.sonatypeRepo("releases")
addSbtPlugin("io.frees" % "sbt-freestyle" % "0.3.14")
addSbtPlugin("io.frees" % "sbt-freestyle" % "0.3.15")
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "0.6.2-SNAPSHOT"
version in ThisBuild := "0.7.0"