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 f50a76a5 use pekko-http 2.0.0-M1 (#600)
f50a76a5 is described below
commit f50a76a54cc62a806dfbb42c4d2ff7fc115bad9a
Author: PJ Fanning <[email protected]>
AuthorDate: Wed Jan 21 01:51:06 2026 +0100
use pekko-http 2.0.0-M1 (#600)
* use pekko-http 2.0.0-M1
* Update build.sbt
* Enable PekkoGrpcPlugin in build.sbt
---
build.sbt | 10 ++++------
project/PekkoHttpDependency.scala | 2 +-
sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt | 2 --
.../src/sbt-test/gen-java/02-server-reflection/build.sbt | 2 --
sbt-plugin/src/sbt-test/gen-java/03-no-java-package/build.sbt | 2 --
.../src/sbt-test/gen-java/04-crash-on-keywords/build.sbt | 2 --
.../05-duplicate-messages-different-packages/build.sbt | 2 --
sbt-plugin/src/sbt-test/gen-java/06-nested-message/build.sbt | 2 --
sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt | 2 --
.../sbt-test/gen-scala-server/01-gen-basic-server/build.sbt | 2 --
.../sbt-test/gen-scala-server/02-multiple-services/build.sbt | 2 --
.../src/sbt-test/gen-scala-server/03-test-config/build.sbt | 2 --
.../sbt-test/gen-scala-server/04-server-reflection/build.sbt | 2 --
.../src/sbt-test/gen-scala-server/05-no-java-package/build.sbt | 2 --
.../gen-scala-server/06-compatibility-plugins/build.sbt | 2 --
.../gen-scala-server/07-gen-basic-server-with-pekko/build.sbt | 2 --
.../gen-scala-server/09-scalapb-customizations/build.sbt | 2 --
.../sbt-test/gen-scala-server/10-scalapb-validate/build.sbt | 2 --
.../11-duplicate-messages-different-packages/build.sbt | 2 --
.../src/sbt-test/scala3/01-basic-client-server/build.sbt | 2 --
20 files changed, 5 insertions(+), 43 deletions(-)
diff --git a/build.sbt b/build.sbt
index 984eeebb..169d6bdc 100644
--- a/build.sbt
+++ b/build.sbt
@@ -19,8 +19,6 @@ import sbt.Keys.scalaVersion
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 =>
@@ -95,10 +93,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.snapshotMain)
- .addPekkoModuleDependency("pekko-http", "", PekkoHttpDependency.snapshotMain)
+ .addPekkoModuleDependency("pekko-http-core", "", PekkoHttpDependency.default)
+ .addPekkoModuleDependency("pekko-http", "", PekkoHttpDependency.default)
.addPekkoModuleDependency("pekko-discovery", "", PekkoCoreDependency.default)
- .addPekkoModuleDependency("pekko-http-cors", "",
PekkoHttpDependency.snapshotMain)
+ .addPekkoModuleDependency("pekko-http-cors", "", PekkoHttpDependency.default)
.addPekkoModuleDependency("pekko-testkit", "test",
PekkoCoreDependency.default)
.addPekkoModuleDependency("pekko-stream-testkit", "test",
PekkoCoreDependency.default)
.settings(Dependencies.runtime)
@@ -191,7 +189,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.snapshotMain)
+ .addPekkoModuleDependency("pekko-http", "", PekkoHttpDependency.default)
.addPekkoModuleDependency("pekko-slf4j", "", PekkoCoreDependency.default)
.addPekkoModuleDependency("pekko-testkit", "test",
PekkoCoreDependency.default)
.addPekkoModuleDependency("pekko-stream-testkit", "test",
PekkoCoreDependency.default)
diff --git a/project/PekkoHttpDependency.scala
b/project/PekkoHttpDependency.scala
index 06d5adc9..671f0a17 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 = determineLatestSnapshot()
+ override val currentVersion: String = "2.0.0-M1"
}
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 72db2d1d..b35319d2 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,8 +11,6 @@ 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 ce4ac8ae..f67b3ce2 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,6 +11,4 @@ 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 ce4ac8ae..f67b3ce2 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,6 +11,4 @@ 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 72db2d1d..b35319d2 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,8 +11,6 @@ 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 ce4ac8ae..f67b3ce2 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,6 +11,4 @@ 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 ce4ac8ae..f67b3ce2 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,6 +11,4 @@ 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 2ab72ede..08a8cc24 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,8 +11,6 @@ organization := "org.apache.pekko"
scalaVersion := "2.13.18"
-resolvers += Resolver.ApacheMavenSnapshotsRepo
-
val grpcVersion = "1.77.1" // 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 657d5f7e..f98fe57d 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,8 +11,6 @@ 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 784f8813..d957a1aa 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,5 +10,3 @@
scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
-
-resolvers += Resolver.ApacheMavenSnapshotsRepo
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 78431d11..8e257482 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,8 +11,6 @@ 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 784f8813..d957a1aa 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,5 +10,3 @@
scalaVersion := "2.13.18"
enablePlugins(PekkoGrpcPlugin)
-
-resolvers += Resolver.ApacheMavenSnapshotsRepo
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 784f8813..d957a1aa 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,5 +10,3 @@
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 8dfbfb2c..5503f639 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,5 +12,3 @@ 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 ddfb4add..c84c2090 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,8 +11,6 @@ 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 ebe2dfcd..b3fd2ece 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,7 +11,5 @@ 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 306819cf..b25a3ab4 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,8 +14,6 @@ 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 784f8813..d957a1aa 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,5 +10,3 @@
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 c218d549..68e19369 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,7 +13,5 @@ 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]
