You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by fa...@apache.org on 2023/08/29 22:05:25 UTC
[incubator-pekko-grpc] branch main updated: use sbt paradox release (#169)
This is an automated email from the ASF dual-hosted git repository.
fanningpj 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 6c48fcd2 use sbt paradox release (#169)
6c48fcd2 is described below
commit 6c48fcd28607ed4cd667d3b7e7cb0c306424e17e
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Tue Aug 29 23:05:20 2023 +0100
use sbt paradox release (#169)
---
benchmark-java/project/build.properties | 2 +-
project/Common.scala | 2 --
project/build.properties | 2 +-
project/plugins.sbt | 6 +-----
.../sbt-test/gen-java/01-gen-basic-java/project/build.properties | 2 +-
.../sbt-test/gen-java/02-server-reflection/project/build.properties | 2 +-
.../sbt-test/gen-java/03-no-java-package/project/build.properties | 2 +-
.../sbt-test/gen-java/04-crash-on-keywords/project/build.properties | 2 +-
.../project/build.properties | 2 +-
.../sbt-test/gen-scala-server/00-interop/project/build.properties | 2 +-
.../gen-scala-server/01-gen-basic-server/project/build.properties | 2 +-
.../gen-scala-server/02-multiple-services/project/build.properties | 2 +-
.../gen-scala-server/03-test-config/project/build.properties | 2 +-
.../gen-scala-server/04-server-reflection/project/build.properties | 2 +-
.../gen-scala-server/05-no-java-package/project/build.properties | 2 +-
.../06-compatibility-plugins/project/build.properties | 2 +-
.../07-gen-basic-server-with-pekko/project/build.properties | 2 +-
.../09-scalapb-customizations/project/build.properties | 2 +-
.../gen-scala-server/10-scalapb-validate/project/build.properties | 2 +-
.../project/build.properties | 2 +-
.../sbt-test/scala3/01-basic-client-server/project/build.properties | 2 +-
21 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/benchmark-java/project/build.properties b/benchmark-java/project/build.properties
index 52413ab7..30409871 100644
--- a/benchmark-java/project/build.properties
+++ b/benchmark-java/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.3
+sbt.version=1.9.4
diff --git a/project/Common.scala b/project/Common.scala
index 84409012..ea80c511 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -30,8 +30,6 @@ object Common extends AutoPlugin {
override def globalSettings =
Seq(
- resolvers ++= Resolver.sonatypeOssRepos("staging"),
- resolvers += Resolver.ApacheMavenSnapshotsRepo,
homepage := Some(url("https://pekko.apache.org//")),
scmInfo := Some(ScmInfo(url("https://github.com/apache/incubator-pekko-grpc"),
"git@github.com:apache/incubator-pekko-grpc")),
diff --git a/project/build.properties b/project/build.properties
index 52413ab7..30409871 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.3
+sbt.version=1.9.4
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 0a556654..6361234e 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -29,16 +29,12 @@ addSbtPlugin("org.mdedetrich" % "sbt-apache-sonatype" % "0.1.10")
addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.10")
addSbtPlugin("com.github.sbt" % "sbt-license-report" % "1.6.1")
-// allow access to snapshots for pekko-sbt-paradox
-resolvers += Resolver.ApacheMavenSnapshotsRepo
-updateOptions := updateOptions.value.withLatestSnapshots(false)
-
// 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+56-bff08336-SNAPSHOT").excludeAll(
+addSbtPlugin(("org.apache.pekko" % "pekko-sbt-paradox" % "1.0.0").excludeAll(
"com.lightbend.paradox", "sbt-paradox",
"com.lightbend.paradox" % "sbt-paradox-apidoc",
"com.lightbend.paradox" % "sbt-paradox-project-info"))
diff --git a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/project/build.properties b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/project/build.properties
index 52413ab7..30409871 100644
--- a/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.3
+sbt.version=1.9.4
diff --git a/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/build.properties b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/build.properties
index 52413ab7..30409871 100644
--- a/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-java/02-server-reflection/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.3
+sbt.version=1.9.4
diff --git a/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/project/build.properties b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/project/build.properties
index 52413ab7..30409871 100644
--- a/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-java/03-no-java-package/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.3
+sbt.version=1.9.4
diff --git a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/project/build.properties b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/project/build.properties
index 52413ab7..30409871 100644
--- a/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.3
+sbt.version=1.9.4
diff --git a/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/project/build.properties b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/project/build.properties
index 52413ab7..30409871 100644
--- a/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.3
+sbt.version=1.9.4
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/project/build.properties
index 52413ab7..30409871 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.3
+sbt.version=1.9.4
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/project/build.properties
index 52413ab7..30409871 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.3
+sbt.version=1.9.4
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/project/build.properties
index 52413ab7..30409871 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.3
+sbt.version=1.9.4
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/project/build.properties
index 52413ab7..30409871 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.3
+sbt.version=1.9.4
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/project/build.properties
index 52413ab7..30409871 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.3
+sbt.version=1.9.4
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/project/build.properties
index 52413ab7..30409871 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/05-no-java-package/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.3
+sbt.version=1.9.4
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/build.properties
index 52413ab7..30409871 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.3
+sbt.version=1.9.4
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/project/build.properties
index 52413ab7..30409871 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.3
+sbt.version=1.9.4
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/project/build.properties
index 52413ab7..30409871 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/09-scalapb-customizations/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.3
+sbt.version=1.9.4
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/project/build.properties
index 52413ab7..30409871 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/10-scalapb-validate/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.3
+sbt.version=1.9.4
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/project/build.properties b/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/project/build.properties
index 52413ab7..30409871 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/project/build.properties
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/11-duplicate-messages-different-packages/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.3
+sbt.version=1.9.4
diff --git a/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/project/build.properties b/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/project/build.properties
index 52413ab7..30409871 100644
--- a/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/project/build.properties
+++ b/sbt-plugin/src/sbt-test/scala3/01-basic-client-server/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.3
+sbt.version=1.9.4
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org