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

Scala2.13.0 rc2 #585

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ language: scala

scala:
- 2.12.8
- 2.13.0-M5

# make sure to fetch enough commits, so that git describe still works
git:
Expand Down
13 changes: 10 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import akka.grpc.Dependencies
import akka.grpc.Dependencies.Versions.scala212
import akka.grpc.Dependencies.Versions.{ scala212, scala213 }
import akka.grpc.ProjectExtensions._
import akka.grpc.build.ReflectiveCodeGen

Expand Down Expand Up @@ -28,6 +28,7 @@ lazy val codegen = Project(
assemblyOption in assembly := (assemblyOption in assembly).value.copy(
prependShellScript = Some(sbtassembly.AssemblyPlugin.defaultShellScript)
),
crossScalaVersions -= scala213,
))
.settings(addArtifact(artifact in (Compile, assembly), assembly))

Expand All @@ -53,6 +54,7 @@ lazy val scalapbProtocPlugin = Project(
assemblyOption in assembly := (assemblyOption in assembly).value.copy(
prependShellScript = Some(sbtassembly.AssemblyPlugin.defaultShellScript)
),
crossScalaVersions -= scala213,
))
.settings(addArtifact(artifact in (Compile, assembly), assembly))

Expand All @@ -65,6 +67,7 @@ lazy val mavenPlugin = Project(
.settings(Seq(
publishMavenStyle := true,
crossPaths := false,
crossScalaVersions := Seq(scala212),
))
.dependsOn(codegen)

Expand All @@ -90,6 +93,7 @@ lazy val sbtPlugin = Project(
},
scriptedBufferLog := false,
crossSbtVersions := Seq("1.0.0"),
crossScalaVersions := Seq(scala212),
)
.dependsOn(codegen)

Expand Down Expand Up @@ -162,7 +166,8 @@ lazy val docs = Project(
),
resolvers += Resolver.jcenterRepo,
publishRsyncArtifact := makeSite.value -> "www/",
publishRsyncHost := "[email protected]"
publishRsyncHost := "[email protected]",
crossScalaVersions := List(scala212, scala213),
)

lazy val pluginTesterScala = Project(
Expand Down Expand Up @@ -206,5 +211,7 @@ lazy val root = Project(
)
.settings(
skip in publish := true,
unmanagedSources in (Compile, headerCreate) := (baseDirectory.value / "project").**("*.scala").get
unmanagedSources in (Compile, headerCreate) := (baseDirectory.value / "project").**("*.scala").get,
// https://github.com/sbt/sbt/issues/3465
crossScalaVersions := List(),
)
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class TestServiceImpl(implicit ec: ExecutionContext, mat: Materializer) extends
Status.fromCodeValue(reqStatus.code).withDescription(reqStatus.message)))
req
}).mapConcat(
_.responseParameters.to[immutable.Seq]).via(parametersToResponseFlow)
_.responseParameters.toList).via(parametersToResponseFlow)

override def halfDuplexCall(in: Source[StreamingOutputCallRequest, NotUsed]): Source[StreamingOutputCallResponse, NotUsed] = ???

Expand All @@ -77,7 +77,7 @@ class TestServiceImpl(implicit ec: ExecutionContext, mat: Materializer) extends
}

override def streamingOutputCall(in: StreamingOutputCallRequest): Source[StreamingOutputCallResponse, NotUsed] =
Source(in.responseParameters.to[immutable.Seq]).via(parametersToResponseFlow)
Source(in.responseParameters.toList).via(parametersToResponseFlow)

override def unimplementedCall(in: Empty): Future[Empty] = ???
}
4 changes: 3 additions & 1 deletion project/Common.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import sbt.Keys._
import sbt._
import sbt.plugins.JvmPlugin
import akka.grpc.Dependencies.Versions.{ scala212, scala213 }

object Common extends AutoPlugin {

Expand Down Expand Up @@ -33,6 +34,7 @@ object Common extends AutoPlugin {
javacOptions ++= List(
"-Xlint:unchecked",
"-Xlint:deprecation"
)
),
crossScalaVersions := Seq(scala212, scala213),
) ++ akka.grpc.Formatting.formatSettings
}
7 changes: 4 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,18 @@ object Dependencies {

object Versions {
val scala212 = "2.12.8"
val scala213 = "2.13.0-RC2"

val akka = "2.5.20"
val akka = "2.5.23"
val akkaHttp = "10.1.8"

val play = "2.7.0"

val grpc = "1.20.0" // checked synced by GrpcVersionSyncCheckPlugin
val config = "1.3.3"
val sslConfig = "0.3.6"
val sslConfig = "0.4.0"

val scalaTest = "3.0.5"
val scalaTest = "3.0.8-RC4"

val maven = "3.5.4"
}
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.2.7
sbt.version=1.2.8
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.5")
// scripted testing
libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value

libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.8.4"
libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.9.0-M4"

// #java-agent-plugin
addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent" % "0.1.5")
Expand Down