From e6a508cdb974f6477285bf751fe1da2f94f76374 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Thu, 21 Sep 2023 09:33:16 +0100 Subject: [PATCH 1/3] test latest grpc snapshot --- build.sbt | 2 ++ project/plugins.sbt | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 454f1533d..18fd5e0f5 100644 --- a/build.sbt +++ b/build.sbt @@ -19,6 +19,8 @@ commands := commands.value.filterNot { command => } } +ThisBuild / resolvers += Resolver.ApacheMavenSnapshotsRepo + ThisBuild / reproducibleBuildsCheckResolver := Resolver.ApacheMavenStagingRepo lazy val `pekko-connectors` = project diff --git a/project/plugins.sbt b/project/plugins.sbt index e30fc1c26..e0e4e225b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -35,6 +35,7 @@ addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2") addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1") // Pekko gRPC -- sync with version in Dependencies.scala:29 -addSbtPlugin("org.apache.pekko" % "pekko-grpc-sbt-plugin" % "1.0.0") +resolvers += Resolver.ApacheMavenSnapshotsRepo +addSbtPlugin("org.apache.pekko" % "pekko-grpc-sbt-plugin" % "1.0.0-15-c95da038-SNAPSHOT") // templating addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.6.1") From 26a150fd7701ebeec111e63fef76160ef17a9e06 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Thu, 5 Oct 2023 18:31:22 +0100 Subject: [PATCH 2/3] use 1.0.1-RC1 --- build.sbt | 2 +- project/plugins.sbt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 18fd5e0f5..6ce8f049a 100644 --- a/build.sbt +++ b/build.sbt @@ -19,7 +19,7 @@ commands := commands.value.filterNot { command => } } -ThisBuild / resolvers += Resolver.ApacheMavenSnapshotsRepo +ThisBuild / resolvers += Resolver.ApacheMavenStagingRepo ThisBuild / reproducibleBuildsCheckResolver := Resolver.ApacheMavenStagingRepo diff --git a/project/plugins.sbt b/project/plugins.sbt index e0e4e225b..7b0bf3c1f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -35,7 +35,7 @@ addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2") addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1") // Pekko gRPC -- sync with version in Dependencies.scala:29 -resolvers += Resolver.ApacheMavenSnapshotsRepo -addSbtPlugin("org.apache.pekko" % "pekko-grpc-sbt-plugin" % "1.0.0-15-c95da038-SNAPSHOT") +resolvers += Resolver.ApacheMavenStagingRepo +addSbtPlugin("org.apache.pekko" % "pekko-grpc-sbt-plugin" % "1.0.1-RC1") // templating addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.6.1") From b3ced5f8a8c214b696319917f85834b8cc2a058d Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Thu, 5 Oct 2023 18:41:38 +0100 Subject: [PATCH 3/3] Update plugins.sbt --- project/plugins.sbt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/project/plugins.sbt b/project/plugins.sbt index 7b0bf3c1f..b51117dc3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,6 +7,8 @@ * This file is part of the Apache Pekko project, which was derived from Akka. */ +dependencyOverrides += "org.scala-lang.modules" %% "scala-xml" % "2.2.0" + addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.31")