This is an automated email from the ASF dual-hosted git repository.
engelen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-grpc.git
The following commit(s) were added to refs/heads/main by this push:
new 06aee9f9 Pekko HTTP snapshot (#568)
06aee9f9 is described below
commit 06aee9f9209da07e831ada43da8711e7c10573e8
Author: Arnout Engelen <[email protected]>
AuthorDate: Mon Dec 15 10:39:04 2025 +0100
Pekko HTTP snapshot (#568)
* pekko 2
* watchTermination API changed
* Try building against Pekko HTTP snapshot
* chore: benchmark-java: avoid now-removed deprecated methods
* chore: snapshot resolvers for sbt tests
* chore: add snapshot repo for java plugin
* chore: scripted test updates
* chore: repo in plugin-tester-scala
* chore: more sbt test syntax updates
---------
Co-authored-by: PJ Fanning <[email protected]>
---
.../pekko/grpc/benchmarks/driver/LoadClient.java | 7 ++++++-
.../pekko/grpc/benchmarks/qps/AsyncClient.java | 7 ++++++-
build.sbt | 9 +++++----
.../grpc/interop/PekkoHttpServerProviderScala.scala | 2 +-
plugin-tester-java/build.gradle | 2 +-
plugin-tester-java/pom.xml | 19 +++++++++++++++++++
plugin-tester-scala/build.gradle | 2 +-
plugin-tester-scala/pom.xml | 21 ++++++++++++++++++++-
project/PekkoCoreDependency.scala | 2 +-
project/PekkoHttpDependency.scala | 2 +-
.../pekko/grpc/internal/PekkoHttpClientUtils.scala | 2 +-
.../sbt-test/gen-java/01-gen-basic-java/build.sbt | 2 ++
.../gen-java/02-server-reflection/build.sbt | 2 ++
.../sbt-test/gen-java/03-no-java-package/build.sbt | 2 ++
.../gen-java/04-crash-on-keywords/build.sbt | 2 ++
.../build.sbt | 2 ++
.../sbt-test/gen-java/06-nested-message/build.sbt | 2 ++
.../sbt-test/gen-scala-server/00-interop/build.sbt | 2 ++
.../gen-scala-server/01-gen-basic-server/build.sbt | 2 ++
.../gen-scala-server/02-multiple-services/build.sbt | 2 ++
.../src/main/scala/example/myapp/Main.scala | 6 +++---
.../gen-scala-server/03-test-config/build.sbt | 2 ++
.../gen-scala-server/04-server-reflection/build.sbt | 2 ++
.../main/scala/example/myapp/helloworld/Main.scala | 9 +++------
.../gen-scala-server/05-no-java-package/build.sbt | 2 ++
.../06-compatibility-plugins/build.sbt | 2 ++
.../07-gen-basic-server-with-pekko/build.sbt | 2 ++
.../09-scalapb-customizations/build.sbt | 2 ++
.../gen-scala-server/10-scalapb-validate/build.sbt | 2 ++
.../build.sbt | 2 ++
.../scala3/01-basic-client-server/build.sbt | 2 ++
31 files changed, 104 insertions(+), 22 deletions(-)
diff --git
a/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/driver/LoadClient.java
b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/driver/LoadClient.java
index cae17a7a..ea083c61 100644
---
a/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/driver/LoadClient.java
+++
b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/driver/LoadClient.java
@@ -40,6 +40,7 @@ import
org.apache.commons.math3.distribution.ExponentialDistribution;
import java.lang.management.ManagementFactory;
import java.net.InetSocketAddress;
import java.util.List;
+import java.util.Optional;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -307,7 +308,11 @@ class LoadClient {
lastCall.set(System.nanoTime());
final AtomicReference<ActorRef> requestIngress = new
AtomicReference<>();
Source<Messages.SimpleRequest, NotUsed> requestSource =
- Source.<Messages.SimpleRequest>actorRef(2,
OverflowStrategy.fail())
+ Source.<Messages.SimpleRequest>actorRef(
+ elem -> Optional.empty(),
+ elem -> Optional.empty(),
+ 2,
+ OverflowStrategy.fail())
.mapMaterializedValue(ref -> {
requestIngress.set(ref);
requestIngress.get().tell(simpleRequest,
ActorRef.noSender());
diff --git
a/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/qps/AsyncClient.java
b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/qps/AsyncClient.java
index c5c7295c..193dc25b 100644
---
a/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/qps/AsyncClient.java
+++
b/benchmark-java/src/main/java/org/apache/pekko/grpc/benchmarks/qps/AsyncClient.java
@@ -41,6 +41,7 @@ import org.HdrHistogram.HistogramIterationValue;
import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.List;
+import java.util.Optional;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
@@ -207,7 +208,11 @@ public class AsyncClient {
lastCall.set(System.nanoTime());
final AtomicReference<ActorRef> requestIngress = new AtomicReference<>();
Source<SimpleRequest, NotUsed> requestSource =
- Source.<SimpleRequest> actorRef(2, OverflowStrategy.fail())
+ Source.<SimpleRequest> actorRef(
+ elem -> Optional.empty(),
+ elem -> Optional.empty(),
+ 2,
+ OverflowStrategy.fail())
.mapMaterializedValue(ref -> {
requestIngress.set(ref);
requestIngress.get().tell(request, ActorRef.noSender());
diff --git a/build.sbt b/build.sbt
index 0cc0e82c..04a1340e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -20,6 +20,7 @@ sourceDistName := "apache-pekko-grpc"
sourceDistIncubating := false
ThisBuild / versionScheme := Some(VersionScheme.SemVerSpec)
ThisBuild / resolvers += Resolver.ApacheMavenStagingRepo
+ThisBuild / resolvers += Resolver.ApacheMavenSnapshotsRepo
commands := commands.value.filterNot { command =>
command.nameOption.exists { name =>
@@ -94,10 +95,10 @@ val mimaCompareVersion = "1.0.2"
lazy val runtime = Project(id = "runtime", base = file("runtime"))
.addPekkoModuleDependency("pekko-stream", "", PekkoCoreDependency.default)
- .addPekkoModuleDependency("pekko-http-core", "", PekkoHttpDependency.default)
- .addPekkoModuleDependency("pekko-http", "", PekkoHttpDependency.default)
+ .addPekkoModuleDependency("pekko-http-core", "",
PekkoHttpDependency.snapshotMain)
+ .addPekkoModuleDependency("pekko-http", "", PekkoHttpDependency.snapshotMain)
.addPekkoModuleDependency("pekko-discovery", "", PekkoCoreDependency.default)
- .addPekkoModuleDependency("pekko-http-cors", "", PekkoHttpDependency.default)
+ .addPekkoModuleDependency("pekko-http-cors", "",
PekkoHttpDependency.snapshotMain)
.addPekkoModuleDependency("pekko-testkit", "test",
PekkoCoreDependency.default)
.addPekkoModuleDependency("pekko-stream-testkit", "test",
PekkoCoreDependency.default)
.settings(Dependencies.runtime)
@@ -190,7 +191,7 @@ lazy val sbtPlugin = Project(id = "sbt-plugin", base =
file("sbt-plugin"))
lazy val interopTests = Project(id = "interop-tests", base =
file("interop-tests"))
.disablePlugins(MimaPlugin)
- .addPekkoModuleDependency("pekko-http", "", PekkoHttpDependency.default)
+ .addPekkoModuleDependency("pekko-http", "", PekkoHttpDependency.snapshotMain)
.addPekkoModuleDependency("pekko-slf4j", "", PekkoCoreDependency.default)
.addPekkoModuleDependency("pekko-testkit", "test",
PekkoCoreDependency.default)
.addPekkoModuleDependency("pekko-stream-testkit", "test",
PekkoCoreDependency.default)
diff --git
a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoHttpServerProviderScala.scala
b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoHttpServerProviderScala.scala
index 6a02f971..64ef1966 100644
---
a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoHttpServerProviderScala.scala
+++
b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoHttpServerProviderScala.scala
@@ -94,7 +94,7 @@ object PekkoHttpServerProviderScala extends
PekkoHttpServerProvider with Directi
}
requestElement
}
- .watchTermination()((NotUsed, f) => {
+ .watchTermination((NotUsed, f) => {
f.foreach(_ => status.trySuccess(Status.OK))
NotUsed
})
diff --git a/plugin-tester-java/build.gradle b/plugin-tester-java/build.gradle
index 5ff60e3b..8f5cee7e 100644
--- a/plugin-tester-java/build.gradle
+++ b/plugin-tester-java/build.gradle
@@ -31,7 +31,7 @@ def scalaBinaryVersion =
"${scalaVersion.major}.${scalaVersion.minor}"
dependencies {
implementation "org.apache.pekko:pekko-http-cors_${scalaBinaryVersion}:1.3.0"
implementation "org.scala-lang:scala-library:${scalaFullVersion}"
- testImplementation
"org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:1.3.0"
+ testImplementation
"org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:2.0.0-M1"
testImplementation "org.scalatest:scalatest_${scalaBinaryVersion}:3.2.19"
testImplementation
"org.scalatestplus:junit-4-13_${scalaBinaryVersion}:3.2.19.0"
}
diff --git a/plugin-tester-java/pom.xml b/plugin-tester-java/pom.xml
index 8fd25c07..8a86e3ac 100644
--- a/plugin-tester-java/pom.xml
+++ b/plugin-tester-java/pom.xml
@@ -29,6 +29,25 @@
<project.encoding>UTF-8</project.encoding>
</properties>
+ <repositories>
+ <repository>
+ <id>central</id>
+ <name>Central Repository</name>
+ <url>https://repo.maven.apache.org/maven2</url>
+ </repository>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Development Snapshot Repository</name>
+ <url>https://repository.apache.org/content/repositories/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>org.apache.pekko</groupId>
diff --git a/plugin-tester-scala/build.gradle b/plugin-tester-scala/build.gradle
index a96da67f..e2f49772 100644
--- a/plugin-tester-scala/build.gradle
+++ b/plugin-tester-scala/build.gradle
@@ -26,7 +26,7 @@ def scalaBinaryVersion =
"${scalaVersion.major}.${scalaVersion.minor}"
dependencies {
implementation "org.apache.pekko:pekko-http-cors_${scalaBinaryVersion}:1.3.0"
implementation "org.scala-lang:scala-library:${scalaFullVersion}"
- testImplementation
"org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:1.3.0"
+ testImplementation
"org.apache.pekko:pekko-stream-testkit_${scalaBinaryVersion}:2.0.0-M1"
testImplementation "org.scalatest:scalatest_${scalaBinaryVersion}:3.2.19"
testImplementation
"org.scalatestplus:junit-4-13_${scalaBinaryVersion}:3.2.19.0"
}
diff --git a/plugin-tester-scala/pom.xml b/plugin-tester-scala/pom.xml
index cd293d54..81c61aa0 100644
--- a/plugin-tester-scala/pom.xml
+++ b/plugin-tester-scala/pom.xml
@@ -22,12 +22,31 @@
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
- <pekko.version>1.3.0</pekko.version>
+ <pekko.version>2.0.0-M1</pekko.version>
<pekko.http.version>1.3.0</pekko.http.version>
<grpc.version>1.77.0</grpc.version> <!-- checked synced by
VersionSyncCheckPlugin -->
<project.encoding>UTF-8</project.encoding>
</properties>
+ <repositories>
+ <repository>
+ <id>central</id>
+ <name>Central Repository</name>
+ <url>https://repo.maven.apache.org/maven2</url>
+ </repository>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Development Snapshot Repository</name>
+ <url>https://repository.apache.org/content/repositories/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>org.apache.pekko</groupId>
diff --git a/project/PekkoCoreDependency.scala
b/project/PekkoCoreDependency.scala
index 8c2d4466..ba4fef75 100644
--- a/project/PekkoCoreDependency.scala
+++ b/project/PekkoCoreDependency.scala
@@ -22,5 +22,5 @@ import com.github.pjfanning.pekkobuild.PekkoDependency
object PekkoCoreDependency extends PekkoDependency {
override val checkProject: String = "pekko-cluster-sharding-typed"
override val module: Option[String] = None
- override val currentVersion: String = "1.3.0"
+ override val currentVersion: String = "2.0.0-M1"
}
diff --git a/project/PekkoHttpDependency.scala
b/project/PekkoHttpDependency.scala
index 451dc5ee..06d5adc9 100644
--- a/project/PekkoHttpDependency.scala
+++ b/project/PekkoHttpDependency.scala
@@ -22,5 +22,5 @@ import com.github.pjfanning.pekkobuild.PekkoDependency
object PekkoHttpDependency extends PekkoDependency {
override val checkProject: String = "pekko-http-testkit"
override val module: Option[String] = Some("http")
- override val currentVersion: String = "1.3.0"
+ override val currentVersion: String = determineLatestSnapshot()
}
diff --git
a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtils.scala
b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtils.scala
index bbf21236..cc685115 100644
---
a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtils.scala
+++
b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtils.scala
@@ -223,7 +223,7 @@ object PekkoHttpClientUtils {
trailerPromise.success(trailer)
ByteString.empty
}
- .watchTermination()((_, done) =>
+ .watchTermination((_, done) =>
done.onComplete(_ =>
trailerPromise.trySuccess(immutable.Seq.empty)))
case Strict(_, data) =>
val rawTrailers =
diff --git a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt
b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt
index 1ec3126a..5109d391 100644
--- a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt
@@ -11,6 +11,8 @@ scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
+resolvers += Resolver.ApacheMavenSnapshotsRepo
+
javacOptions += "-Xdoclint:all"
pekkoGrpcGeneratedLanguages := Seq(PekkoGrpc.Java)
diff --git a/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt
b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt
index f67b3ce2..ce4ac8ae 100644
--- a/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt
@@ -11,4 +11,6 @@ scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
+resolvers += Resolver.ApacheMavenSnapshotsRepo
+
pekkoGrpcGeneratedLanguages := Seq(PekkoGrpc.Java)
diff --git a/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt
b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt
index f67b3ce2..ce4ac8ae 100644
--- a/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt
@@ -11,4 +11,6 @@ scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
+resolvers += Resolver.ApacheMavenSnapshotsRepo
+
pekkoGrpcGeneratedLanguages := Seq(PekkoGrpc.Java)
diff --git a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt
b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt
index 1ec3126a..5109d391 100644
--- a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt
@@ -11,6 +11,8 @@ scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
+resolvers += Resolver.ApacheMavenSnapshotsRepo
+
javacOptions += "-Xdoclint:all"
pekkoGrpcGeneratedLanguages := Seq(PekkoGrpc.Java)
diff --git
a/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt
b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt
index f67b3ce2..ce4ac8ae 100644
---
a/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt
+++
b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt
@@ -11,4 +11,6 @@ scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
+resolvers += Resolver.ApacheMavenSnapshotsRepo
+
pekkoGrpcGeneratedLanguages := Seq(PekkoGrpc.Java)
diff --git a/sbt-plugin/src/sbt-test/gen-java/06-nested-message/build.sbt
b/sbt-plugin/src/sbt-test/gen-java/06-nested-message/build.sbt
index f67b3ce2..ce4ac8ae 100644
--- a/sbt-plugin/src/sbt-test/gen-java/06-nested-message/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-java/06-nested-message/build.sbt
@@ -11,4 +11,6 @@ scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
+resolvers += Resolver.ApacheMavenSnapshotsRepo
+
pekkoGrpcGeneratedLanguages := Seq(PekkoGrpc.Java)
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
index 1455a57e..144562db 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
@@ -11,6 +11,8 @@ organization := "org.apache.pekko"
scalaVersion := "2.13.18"
+resolvers += Resolver.ApacheMavenSnapshotsRepo
+
val grpcVersion = "1.77.0" // checked synced by VersionSyncCheckPlugin
libraryDependencies ++= Seq(
diff --git
a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt
b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt
index f98fe57d..657d5f7e 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt
@@ -11,6 +11,8 @@ scalacOptions += "-Xfatal-warnings"
scalaVersion := "2.13.18"
+resolvers += Resolver.ApacheMavenSnapshotsRepo
+
enablePlugins(PekkoGrpcPlugin)
assembly / assemblyMergeStrategy := {
diff --git
a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/build.sbt
b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/build.sbt
index d957a1aa..784f8813 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/build.sbt
@@ -10,3 +10,5 @@
scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
+
+resolvers += Resolver.ApacheMavenSnapshotsRepo
diff --git
a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/src/main/scala/example/myapp/Main.scala
b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/src/main/scala/example/myapp/Main.scala
index 7170b3af..8afa412c 100644
---
a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/src/main/scala/example/myapp/Main.scala
+++
b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/src/main/scala/example/myapp/Main.scala
@@ -16,7 +16,7 @@ import javax.net.ssl.{ KeyManagerFactory, SSLContext }
import org.apache.pekko
import pekko.actor.ActorSystem
import pekko.grpc.scaladsl.ServiceHandler
-import pekko.http.scaladsl.{ Http, HttpsConnectionContext }
+import pekko.http.scaladsl.{ ConnectionContext, Http }
import example.myapp.echo.EchoServiceImpl
import example.myapp.echo.grpc.EchoServiceHandler
@@ -25,7 +25,7 @@ import example.myapp.helloworld.GreeterServiceImpl
import example.myapp.helloworld.grpc.GreeterServiceHandler
object Main extends App {
- implicit val system = ActorSystem()
+ implicit val system: ActorSystem = ActorSystem()
val echoHandler = EchoServiceHandler.partial(new EchoServiceImpl)
val greeterHandler = GreeterServiceHandler.partial(new GreeterServiceImpl)
@@ -48,6 +48,6 @@ object Main extends App {
val context = SSLContext.getInstance("TLS")
context.init(keyManagerFactory.getKeyManagers, null, new SecureRandom)
- new HttpsConnectionContext(context)
+ ConnectionContext.httpsServer(context)
}
}
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt
b/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt
index 8e257482..78431d11 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt
@@ -11,6 +11,8 @@ scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
+resolvers += Resolver.ApacheMavenSnapshotsRepo
+
Compile / pekkoGrpcGeneratedSources := Seq(PekkoGrpc.Server)
//#test
diff --git
a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt
b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt
index d957a1aa..784f8813 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt
@@ -10,3 +10,5 @@
scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
+
+resolvers += Resolver.ApacheMavenSnapshotsRepo
diff --git
a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/src/main/scala/example/myapp/helloworld/Main.scala
b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/src/main/scala/example/myapp/helloworld/Main.scala
index 9e6b4cb6..c814e848 100644
---
a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/src/main/scala/example/myapp/helloworld/Main.scala
+++
b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/src/main/scala/example/myapp/helloworld/Main.scala
@@ -33,7 +33,7 @@ object Main extends App {
val conf = ConfigFactory
.parseString("pekko.http.server.preview.enable-http2 = on")
.withFallback(ConfigFactory.defaultApplication())
- implicit val sys = ActorSystem("HelloWorld", conf)
+ implicit val sys: ActorSystem = ActorSystem("HelloWorld", conf)
implicit val ec: ExecutionContext = sys.dispatcher
@@ -46,11 +46,8 @@ object Main extends App {
GreeterServiceHandler.withServerReflection(new GreeterServiceImpl())
// Bind service handler servers to localhost:8080
- val binding = Http().bindAndHandleAsync(
- greeter,
- interface = "127.0.0.1",
- port = 8080,
- connectionContext = HttpConnectionContext())
+ val binding = Http().newServerAt("127.0.0.1", 8080)
+ .bind(greeter)
// #server-reflection
// report successful binding
diff --git
a/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt
b/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt
index d957a1aa..784f8813 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/build.sbt
@@ -10,3 +10,5 @@
scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
+
+resolvers += Resolver.ApacheMavenSnapshotsRepo
diff --git
a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt
b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt
index 5503f639..8dfbfb2c 100644
---
a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt
+++
b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt
@@ -12,3 +12,5 @@ enablePlugins(ProtocGoPlugin) // enable it first to test
possibility of getting
scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
+
+resolvers += Resolver.ApacheMavenSnapshotsRepo
diff --git
a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/build.sbt
b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/build.sbt
index c84c2090..ddfb4add 100644
---
a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/build.sbt
+++
b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/build.sbt
@@ -11,6 +11,8 @@ scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
+resolvers += Resolver.ApacheMavenSnapshotsRepo
+
assembly / assemblyMergeStrategy := {
// https://github.com/akka/akka/issues/29456
case PathList("google", "protobuf", _*) => MergeStrategy.discard
diff --git
a/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt
b/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt
index b3fd2ece..ebe2dfcd 100644
---
a/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt
+++
b/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/build.sbt
@@ -11,5 +11,7 @@ scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
+resolvers += Resolver.ApacheMavenSnapshotsRepo
+
// Don't enable it flat_package globally, but via a package-level option
instead (see package.proto)
pekkoGrpcCodeGeneratorSettings -= "flat_package"
diff --git
a/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt
b/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt
index b25a3ab4..306819cf 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/build.sbt
@@ -14,6 +14,8 @@ scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
+resolvers += Resolver.ApacheMavenSnapshotsRepo
+
libraryDependencies +=
"com.thesamet.scalapb" %% "scalapb-validate-core" %
scalapb.validate.compiler.BuildInfo.version % "protobuf"
Compile / PB.targets +=
diff --git
a/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/build.sbt
b/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/build.sbt
index d957a1aa..784f8813 100644
---
a/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/build.sbt
+++
b/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/build.sbt
@@ -10,3 +10,5 @@
scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
+
+resolvers += Resolver.ApacheMavenSnapshotsRepo
diff --git a/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt
b/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt
index 68e19369..c218d549 100644
--- a/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt
+++ b/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt
@@ -13,5 +13,7 @@ scalacOptions += "-Xfatal-warnings"
enablePlugins(PekkoGrpcPlugin)
+resolvers += Resolver.ApacheMavenSnapshotsRepo
+
libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % "3.2.19" % Test)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
