This is an automated email from the ASF dual-hosted git repository.
mdedetrich pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-grpc.git
The following commit(s) were added to refs/heads/main by this push:
new fa38a7d2 Update sbt
fa38a7d2 is described below
commit fa38a7d2d5fd69e6827bbec102ef43410ed38785
Author: Matthew de Detrich <[email protected]>
AuthorDate: Sat Mar 25 13:15:29 2023 +0100
Update sbt
---
project/Dependencies.scala | 10 ++++++++--
project/build.properties | 2 +-
project/plugins.sbt | 3 +++
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 3a096c1d..37297231 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -114,7 +114,10 @@ object Dependencies {
Compile.pekkoHttpCore,
Compile.pekkoHttp,
Compile.pekkoDiscovery,
- Compile.pekkoHttpCors % "provided",
+ // Remove exclusion rule when proper release of pekko-http-cors is made
+ (Compile.pekkoHttpCors % "provided").excludeAll(
+ "org.apache.pekko" %% "pekko-http"),
+ Compile.pekkoHttp % "provided",
Test.pekkoTestkit,
Test.pekkoStreamTestkit,
Test.scalaTest,
@@ -147,7 +150,10 @@ object Dependencies {
val pluginTester = l ++= Seq(
// usually automatically added by `suggestedDependencies`, which doesn't
work with ReflectiveCodeGen
Compile.grpcStub,
- Compile.pekkoHttpCors,
+ // Remove exclusion rule when proper release of pekko-http-cors is made
+ Compile.pekkoHttpCors.excludeAll(
+ "org.apache.pekko" %% "pekko-http"),
+ Compile.pekkoHttp,
Test.scalaTest,
Test.scalaTestPlusJunit,
Protobuf.googleCommonProtos)
diff --git a/project/build.properties b/project/build.properties
index 22af2628..46e43a97 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.1
+sbt.version=1.8.2
diff --git a/project/plugins.sbt b/project/plugins.sbt
index ffb6eef9..8da9fc40 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -21,6 +21,9 @@ addSbtPlugin("org.mdedetrich" % "sbt-apache-sonatype" %
"0.1.6")
// allow access to snapshots for pekko-sbt-paradox
resolvers += "Apache Nexus
Snapshots".at("https://repository.apache.org/content/repositories/snapshots/";)
+// See https://github.com/akka/akka-http/pull/3995 and
https://github.com/akka/akka-http/pull/3995#issuecomment-1026978593
+libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % "always"
+
// We have to deliberately use older versions of sbt-paradox because current
Pekko sbt build
// only loads on JDK 1.8 so we need to bring in older versions of parboiled
which support JDK 1.8
addSbtPlugin(("org.apache.pekko" % "pekko-sbt-paradox" %
"0.0.0+28-a1dda63b-SNAPSHOT").excludeAll(
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
