You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by md...@apache.org on 2023/02/28 12:10:10 UTC

[incubator-pekko-grpc] branch main updated: Remove pekko-grpc prefix from project ids

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 7fc8f211 Remove pekko-grpc prefix from project ids
7fc8f211 is described below

commit 7fc8f211abd802cfabfeeea0c093f744bf04aea6
Author: Matthew de Detrich <ma...@aiven.io>
AuthorDate: Tue Feb 28 10:17:28 2023 +0100

    Remove pekko-grpc prefix from project ids
---
 .github/workflows/build-test.yml                   |  6 ++--
 .github/workflows/link-validator.yml               |  2 +-
 .github/workflows/publish.yml                      |  4 +--
 CONTRIBUTING.md                                    |  2 +-
 benchmark-java/build.sbt                           |  4 +--
 benchmark-java/project/plugins.sbt                 |  2 +-
 build.sbt                                          | 37 ++++++++++++++--------
 docs/src/main/paradox/client/walkthrough.md        |  2 +-
 docs/src/main/paradox/overview.md                  |  2 +-
 docs/src/main/paradox/server/walkthrough.md        |  2 +-
 gradle-plugin/README.md                            |  3 +-
 .../grpc/interop/app/PekkoHttpServerAppScala.scala |  2 +-
 plugin-tester-java/README.md                       |  2 +-
 plugin-tester-java/pom.xml                         |  2 +-
 plugin-tester-scala/pom.xml                        |  2 +-
 project/ProjectExtensions.scala                    |  2 +-
 project/ReflectiveCodeGen.scala                    |  8 ++---
 project/project-info.conf                          |  2 +-
 18 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 57657e21..a4837053 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -123,7 +123,7 @@ jobs:
         uses: coursier/cache-action@v6
 
       - name: Scripted ${{ matrix.test-set }}
-        run: cp .jvmopts-ghactions .jvmopts && sbt ++${{ matrix.scala-version }}.* "sbt-pekko-grpc/scripted ${{ matrix.test-set }}/*"
+        run: cp .jvmopts-ghactions .jvmopts && sbt ++${{ matrix.scala-version }}.* "sbt-plugin/scripted ${{ matrix.test-set }}/*"
 
   test-gradle:
     name: Gradle tests
@@ -161,7 +161,7 @@ jobs:
       - name: Publish artifacts locally
         run: |-
           cp .jvmopts-ghactions .jvmopts
-          sbt pekko-grpc-codegen/publishM2 pekko-grpc-scalapb-protoc-plugin/publishM2 +pekko-grpc-runtime/publishM2
+          sbt codegen/publishM2 scalapb-protoc-plugin/publishM2 +runtime/publishM2
           cd gradle-plugin
           ./gradlew clean publishToMavenLocal --console=plain --info --stacktrace
           find ~/.m2 | grep gradle
@@ -215,7 +215,7 @@ jobs:
       - name: Publish artifacts locally
         run: |-
           cp .jvmopts-ghactions .jvmopts
-          sbt pekko-grpc-codegen/publishM2 pekko-grpc-scalapb-protoc-plugin/publishM2 +pekko-grpc-runtime/publishM2 pekko-grpc-maven-plugin/publishM2
+          sbt codegen/publishM2 scalapb-protoc-plugin/publishM2 +runtime/publishM2 maven-plugin/publishM2
 
       - name: Test Maven Java
         run: |-
diff --git a/.github/workflows/link-validator.yml b/.github/workflows/link-validator.yml
index c00340c5..5b6a3e27 100644
--- a/.github/workflows/link-validator.yml
+++ b/.github/workflows/link-validator.yml
@@ -27,7 +27,7 @@ jobs:
         uses: coursier/cache-action@v6
 
       - name: sbt site
-        run: sbt pekko-grpc-docs/makeSite
+        run: sbt docs/makeSite
 
       - name: Install Coursier command line tool
         run: curl -fLo cs https://git.io/coursier-cli-linux && chmod +x cs && ./cs
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 4c3ecc29..1c9a2934 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -28,7 +28,7 @@ jobs:
         run: |-
           cp .jvmopts-ghactions .jvmopts
           sbt ci-release
-          CI_RELEASE=pekko-grpc-codegen/publishSigned CI_SNAPSHOT_RELEASE=pekko-grpc-codegen/publish sbt ++2.13.8\! ci-release
+          CI_RELEASE=codegen/publishSigned CI_SNAPSHOT_RELEASE=codegen/publish sbt ++2.13.8\! ci-release
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
@@ -82,6 +82,6 @@ jobs:
           chmod 600 /tmp/id_rsa
           ssh-add /tmp/id_rsa
           cp .jvmopts-ghactions .jvmopts
-          sbt pekko-grpc-docs/publishRsync
+          sbt docs/publishRsync
         env:
           SCP_SECRET: ${{ secrets.SCP_SECRET }}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 12ba08fb..3ee998ea 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -175,7 +175,7 @@ Refer to its documentation to learn about the more advanced features it provides
 To generate documentation you can:
 
 ```
-> project pekko-grpc-docs
+> project docs
 > paradox
 ```
 
diff --git a/benchmark-java/build.sbt b/benchmark-java/build.sbt
index 4decdf72..3a5d70f7 100644
--- a/benchmark-java/build.sbt
+++ b/benchmark-java/build.sbt
@@ -7,9 +7,9 @@ pekkoGrpcGeneratedLanguages := Seq(PekkoGrpc.Java)
 
 val grpcVersion = "1.48.1" // checked synced by VersionSyncCheckPlugin
 
-val runtimeProject = ProjectRef(file("../"), "pekko-grpc-runtime")
+val runtimeProject = ProjectRef(file("../"), "runtime")
 
-val codeGenProject = ProjectRef(file("../"), "pekko-grpc-codegen")
+val codeGenProject = ProjectRef(file("../"), "codegen")
 
 val root = project
   .in(file("."))
diff --git a/benchmark-java/project/plugins.sbt b/benchmark-java/project/plugins.sbt
index 25dff29e..865256d0 100644
--- a/benchmark-java/project/plugins.sbt
+++ b/benchmark-java/project/plugins.sbt
@@ -1,3 +1,3 @@
-lazy val plugins = (project in file(".")).dependsOn(ProjectRef(file("../../"), "sbt-pekko-grpc"))
+lazy val plugins = (project in file(".")).dependsOn(ProjectRef(file("../../"), "sbt-plugin"))
 // Use this instead of above when importing to IDEA, after publishLocal and replacing the version here
 //addSbtPlugin("com.lightbend.akka.grpc" % "sbt-pekko-grpc" % "0.1+32-fd597fcb+20180618-1248")
diff --git a/build.sbt b/build.sbt
index e83cc5e6..9336a32e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -5,7 +5,8 @@ import org.apache.pekko.grpc.build.ReflectiveCodeGen
 import com.typesafe.tools.mima.core._
 import sbt.Keys.scalaVersion
 
-val pekkoGrpcRuntimeName = "pekko-grpc-runtime"
+val pekkoPrefix = "pekko-grpc"
+val pekkoGrpcRuntimeName = s"$pekkoPrefix-runtime"
 
 lazy val mkBatAssemblyTask = taskKey[File]("Create a Windows bat assembly")
 
@@ -14,14 +15,15 @@ lazy val mkBatAssemblyTask = taskKey[File]("Create a Windows bat assembly")
 
 ThisBuild / resolvers += "Apache Snapshots".at("https://repository.apache.org/content/repositories/snapshots/")
 
-val pekkoGrpcCodegenId = "pekko-grpc-codegen"
-lazy val codegen = Project(id = pekkoGrpcCodegenId, base = file("codegen"))
+val pekkoGrpcCodegenId = s"$pekkoPrefix-codegen"
+lazy val codegen = Project(id = "codegen", base = file("codegen"))
   .enablePlugins(SbtTwirl, BuildInfoPlugin)
   .enablePlugins(ReproducibleBuildsPlugin)
   .disablePlugins(MimaPlugin)
   .settings(Dependencies.codegen)
   .settings(resolvers += Resolver.sbtPluginRepo("releases"))
   .settings(
+    name := s"$pekkoPrefix-codegen",
     mkBatAssemblyTask := {
       val file = assembly.value
       Assemblies.mkBatAssembly(file)
@@ -45,13 +47,14 @@ lazy val codegen = Project(id = pekkoGrpcCodegenId, base = file("codegen"))
   .settings(addArtifact(Compile / assembly / artifact, assembly))
   .settings(addArtifact(Artifact(pekkoGrpcCodegenId, "bat", "bat", "bat"), mkBatAssemblyTask))
 
-lazy val runtime = Project(id = pekkoGrpcRuntimeName, base = file("runtime"))
+lazy val runtime = Project(id = "runtime", base = file("runtime"))
   .settings(Dependencies.runtime)
   .settings(VersionGenerator.settings)
   .settings(
     crossScalaVersions := Dependencies.Versions.CrossScalaForLib,
     scalaVersion := Dependencies.Versions.CrossScalaForLib.head)
   .settings(
+    name := pekkoGrpcRuntimeName,
     mimaFailOnNoPrevious := true,
     mimaPreviousArtifacts := Set.empty, // temporarily disable mima checks
     AutomaticModuleName.settings("pekko.grpc.runtime"),
@@ -63,12 +66,13 @@ lazy val runtime = Project(id = pekkoGrpcRuntimeName, base = file("runtime"))
   .enablePlugins(ReproducibleBuildsPlugin)
 
 /** This could be an independent project - or does upstream provide this already? didn't find it.. */
-val pekkoGrpcProtocPluginId = "pekko-grpc-scalapb-protoc-plugin"
-lazy val scalapbProtocPlugin = Project(id = pekkoGrpcProtocPluginId, base = file("scalapb-protoc-plugin"))
+val pekkoGrpcProtocPluginId = s"$pekkoPrefix-scalapb-protoc-plugin"
+lazy val scalapbProtocPlugin = Project(id = "scalapb-protoc-plugin", base = file("scalapb-protoc-plugin"))
   .disablePlugins(MimaPlugin)
   /** TODO we only really need to depend on scalapb */
   .dependsOn(codegen)
   .settings(
+    name := s"$pekkoPrefix-scalapb-protoc-plugin",
     mkBatAssemblyTask := {
       val file = assembly.value
       Assemblies.mkBatAssembly(file)
@@ -88,12 +92,13 @@ lazy val scalapbProtocPlugin = Project(id = pekkoGrpcProtocPluginId, base = file
   .settings(addArtifact(Artifact(pekkoGrpcProtocPluginId, "bat", "bat", "bat"), mkBatAssemblyTask))
   .enablePlugins(ReproducibleBuildsPlugin)
 
-lazy val mavenPlugin = Project(id = "pekko-grpc-maven-plugin", base = file("maven-plugin"))
+lazy val mavenPlugin = Project(id = "maven-plugin", base = file("maven-plugin"))
   .enablePlugins(org.apache.pekko.grpc.SbtMavenPlugin)
   .enablePlugins(ReproducibleBuildsPlugin)
   .disablePlugins(MimaPlugin)
   .settings(Dependencies.mavenPlugin)
   .settings(
+    name := s"$pekkoPrefix-maven-plugin",
     publishMavenStyle := true,
     crossPaths := false,
     crossScalaVersions := Dependencies.Versions.CrossScalaForPlugin,
@@ -101,12 +106,13 @@ lazy val mavenPlugin = Project(id = "pekko-grpc-maven-plugin", base = file("mave
   .settings(MetaInfLicenseNoticeCopy.settings)
   .dependsOn(codegen)
 
-lazy val sbtPlugin = Project(id = "sbt-pekko-grpc", base = file("sbt-plugin"))
+lazy val sbtPlugin = Project(id = "sbt-plugin", base = file("sbt-plugin"))
   .enablePlugins(SbtPlugin)
   .enablePlugins(ReproducibleBuildsPlugin)
   .disablePlugins(MimaPlugin)
   .settings(Dependencies.sbtPlugin)
   .settings(
+    name := s"sbt-$pekkoPrefix",
     /** And for scripted tests: */
     scriptedLaunchOpts += ("-Dproject.version=" + version.value),
     scriptedLaunchOpts ++= sys.props.collect { case (k @ "sbt.ivy.home", v) => s"-D$k=$v" }.toSeq,
@@ -123,7 +129,7 @@ lazy val sbtPlugin = Project(id = "sbt-pekko-grpc", base = file("sbt-plugin"))
   .settings(MetaInfLicenseNoticeCopy.settings)
   .dependsOn(codegen)
 
-lazy val interopTests = Project(id = "pekko-grpc-interop-tests", base = file("interop-tests"))
+lazy val interopTests = Project(id = "interop-tests", base = file("interop-tests"))
   .disablePlugins(MimaPlugin)
   .settings(Dependencies.interopTests)
   .settings(
@@ -131,6 +137,7 @@ lazy val interopTests = Project(id = "pekko-grpc-interop-tests", base = file("in
     scalaVersion := Dependencies.Versions.CrossScalaForLib.head)
   .pluginTestingSettings
   .settings(
+    name := s"$pekkoPrefix-interop-tests",
     // All io.grpc servers want to bind to port :8080
     parallelExecution := false,
     ReflectiveCodeGen.generatedLanguages := Seq("Scala", "Java"),
@@ -166,19 +173,20 @@ lazy val benchmarks = Project(id = "benchmarks", base = file("benchmarks"))
   .enablePlugins(JmhPlugin)
   .disablePlugins(MimaPlugin)
   .settings(
+    name := s"$pekkoPrefix-benchmarks",
     crossScalaVersions := Dependencies.Versions.CrossScalaForLib,
     scalaVersion := Dependencies.Versions.CrossScalaForLib.head,
     (publish / skip) := true)
   .settings(MetaInfLicenseNoticeCopy.settings)
 
-lazy val docs = Project(id = "pekko-grpc-docs", base = file("docs"))
+lazy val docs = Project(id = "docs", base = file("docs"))
 // Make sure code generation is run:
   .dependsOn(pluginTesterScala)
   .dependsOn(pluginTesterJava)
   .enablePlugins(AkkaParadoxPlugin, ParadoxSitePlugin, PreprocessPlugin, PublishRsyncPlugin)
   .disablePlugins(MimaPlugin)
   .settings(
-    name := "Apache Pekko gRPC",
+    name := s"$pekkoPrefix-docs",
     publish / skip := true,
     makeSite := makeSite.dependsOn(LocalRootProject / ScalaUnidoc / doc).value,
     previewPath := (Paradox / siteSubdirName).value,
@@ -215,10 +223,11 @@ lazy val docs = Project(id = "pekko-grpc-docs", base = file("docs"))
     crossScalaVersions := Dependencies.Versions.CrossScalaForLib,
     scalaVersion := Dependencies.Versions.CrossScalaForLib.head)
 
-lazy val pluginTesterScala = Project(id = "pekko-grpc-plugin-tester-scala", base = file("plugin-tester-scala"))
+lazy val pluginTesterScala = Project(id = "plugin-tester-scala", base = file("plugin-tester-scala"))
   .disablePlugins(MimaPlugin)
   .settings(Dependencies.pluginTester)
   .settings(
+    name := s"$pekkoPrefix-plugin-tester-scala",
     (publish / skip) := true,
     fork := true,
     crossScalaVersions := Dependencies.Versions.CrossScalaForLib,
@@ -227,10 +236,11 @@ lazy val pluginTesterScala = Project(id = "pekko-grpc-plugin-tester-scala", base
   .settings(MetaInfLicenseNoticeCopy.settings)
   .pluginTestingSettings
 
-lazy val pluginTesterJava = Project(id = "pekko-grpc-plugin-tester-java", base = file("plugin-tester-java"))
+lazy val pluginTesterJava = Project(id = "plugin-tester-java", base = file("plugin-tester-java"))
   .disablePlugins(MimaPlugin)
   .settings(Dependencies.pluginTester)
   .settings(
+    name := s"$pekkoPrefix-plugin-tester-java",
     (publish / skip) := true,
     fork := true,
     ReflectiveCodeGen.generatedLanguages := Seq("Java"),
@@ -255,6 +265,7 @@ lazy val root = Project(id = "pekko-grpc", base = file("."))
     benchmarks,
     docs)
   .settings(
+    name := s"$pekkoPrefix-root",
     (publish / skip) := true,
     (Compile / headerCreate / unmanagedSources) := (baseDirectory.value / "project").**("*.scala").get,
     // unidoc combines sources and jars from all subprojects and that
diff --git a/docs/src/main/paradox/client/walkthrough.md b/docs/src/main/paradox/client/walkthrough.md
index 486a3eac..0b4971ff 100644
--- a/docs/src/main/paradox/client/walkthrough.md
+++ b/docs/src/main/paradox/client/walkthrough.md
@@ -98,7 +98,7 @@ The Akka gRPC plugin makes your code depend on the `pekko-grpc-runtime` library.
 
 The table below shows direct dependencies of it and the second tab shows all libraries it depends on transitively. Be aware that the `io.grpc.grpc-api` library depends on Guava.
 
-@@dependencies { projectId="pekko-grpc-runtime" }
+@@dependencies { projectId="runtime" }
 
 ## Generating Service Stubs
 
diff --git a/docs/src/main/paradox/overview.md b/docs/src/main/paradox/overview.md
index 820ba7e1..504f4bcb 100644
--- a/docs/src/main/paradox/overview.md
+++ b/docs/src/main/paradox/overview.md
@@ -27,7 +27,7 @@ It features:
 
 ## Project Information
 
-@@project-info{ projectId="pekko-grpc-runtime" }
+@@project-info{ projectId="runtime" }
 
 ## Project Status
 
diff --git a/docs/src/main/paradox/server/walkthrough.md b/docs/src/main/paradox/server/walkthrough.md
index d2a45c76..64212f70 100644
--- a/docs/src/main/paradox/server/walkthrough.md
+++ b/docs/src/main/paradox/server/walkthrough.md
@@ -96,7 +96,7 @@ The Akka gRPC plugin makes your code depend on the `pekko-grpc-runtime` library.
 
 The table below shows direct dependencies of it and the second tab shows all libraries it depends on transitively. Be aware that the `io.grpc.grpc-api` library depends on Guava.
 
-@@dependencies { projectId="pekko-grpc-runtime" }
+@@dependencies { projectId="runtime" }
 
 ## Writing a service definition
 
diff --git a/gradle-plugin/README.md b/gradle-plugin/README.md
index 5f3bf25d..9e914662 100644
--- a/gradle-plugin/README.md
+++ b/gradle-plugin/README.md
@@ -3,5 +3,4 @@
 Notes on how it works:
 
 The plugin uses a gradle protobuf plugin, and then hooks our custom generators in through the Main class in the
-pekko-grpc-codegen module (and additionally the Main of pekko-grpc-scalapb-protoc-plugin scalapb for when building Scala
-projects with gradle)
+codegen module (and additionally the Main of scalapb-protoc-plugin scalapb for when building Scala projects with gradle)
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/app/PekkoHttpServerAppScala.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/app/PekkoHttpServerAppScala.scala
index 01d99ad1..5ad497cd 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/app/PekkoHttpServerAppScala.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/app/PekkoHttpServerAppScala.scala
@@ -12,7 +12,7 @@ import org.apache.pekko.grpc.interop.PekkoHttpServerProviderScala
  *
  * This can be useful for 'manually' interacting with this server.
  *
- * You can start this app from sbt with 'pekko-grpc-interop-tests/test:reStart'
+ * You can start this app from sbt with 'interop-tests/test:reStart'
  */
 object PekkoHttpServerAppScala extends App {
   val (sys, binding) = PekkoHttpServerProviderScala.server.start(Array())
diff --git a/plugin-tester-java/README.md b/plugin-tester-java/README.md
index a73daf36..29807876 100644
--- a/plugin-tester-java/README.md
+++ b/plugin-tester-java/README.md
@@ -3,6 +3,6 @@
 Use this project to test the behavior of the sbt plugin without the need of separately releasing it from within the main build.
 
 ```
-project pekko-grpc-plugin-tester-java
+project plugin-tester-java
 test
 ```
diff --git a/plugin-tester-java/pom.xml b/plugin-tester-java/pom.xml
index 5c6b7fae..1e61f46d 100644
--- a/plugin-tester-java/pom.xml
+++ b/plugin-tester-java/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  To test locally, first 'sbt pekko-grpc-maven-plugin:publishM2' in the parent dir
+  To test locally, first 'sbt maven-plugin:publishM2' in the parent dir
   and define the published version as pekko.grpc.project.version in the properties block below
   or pass it to mvn when running like so: mvn -Dpekko.grpc.project.version=some-version compile exec:exec
 -->
diff --git a/plugin-tester-scala/pom.xml b/plugin-tester-scala/pom.xml
index 4775cdd1..fa673918 100644
--- a/plugin-tester-scala/pom.xml
+++ b/plugin-tester-scala/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  To test locally, first 'sbt pekko-grpc-maven-plugin:publishM2' in the parent dir
+  To test locally, first 'sbt maven-plugin:publishM2' in the parent dir
   and define the published version as pekko.grpc.project.version in the properties block below
   or pass it to mvn when running like so: mvn -Dpekko.grpc.project.version=some-version compile exec:exec
 -->
diff --git a/project/ProjectExtensions.scala b/project/ProjectExtensions.scala
index a792c8e6..9abdca28 100644
--- a/project/ProjectExtensions.scala
+++ b/project/ProjectExtensions.scala
@@ -8,7 +8,7 @@ object ProjectExtensions {
 
     /** Add settings to test the sbt-plugin in-process */
     def pluginTestingSettings: Project =
-      project.dependsOn(ProjectRef(file("."), "pekko-grpc-runtime")).enablePlugins(
+      project.dependsOn(ProjectRef(file("."), "runtime")).enablePlugins(
         org.apache.pekko.grpc.build.ReflectiveCodeGen)
   }
 }
diff --git a/project/ReflectiveCodeGen.scala b/project/ReflectiveCodeGen.scala
index db7ac16e..8be6c288 100644
--- a/project/ReflectiveCodeGen.scala
+++ b/project/ReflectiveCodeGen.scala
@@ -52,7 +52,7 @@ object ReflectiveCodeGen extends AutoPlugin {
         PB.targets := scala.collection.mutable.ListBuffer.empty,
         // Put an artifact resolver that returns the project's classpath for our generators
         PB.artifactResolver := Def.taskDyn {
-          val cp = (ProjectRef(file("."), "pekko-grpc-codegen") / Compile / fullClasspath).value.map(_.data)
+          val cp = (ProjectRef(file("."), "codegen") / Compile / fullClasspath).value.map(_.data)
           val oldResolver = PB.artifactResolver.value
           Def.task { (artifact: BridgeArtifact) =>
             artifact.groupId match {
@@ -65,7 +65,7 @@ object ReflectiveCodeGen extends AutoPlugin {
         }.value,
         setCodeGenerator := loadAndSetGenerator(
           // the magic sauce: use the output classpath from the the sbt-plugin project and instantiate generators from there
-          (ProjectRef(file("."), "sbt-pekko-grpc") / Compile / fullClasspath).value,
+          (ProjectRef(file("."), "sbt-plugin") / Compile / fullClasspath).value,
           generatedLanguages.value,
           generatedSources.value,
           extraGenerators.value,
@@ -81,8 +81,8 @@ object ReflectiveCodeGen extends AutoPlugin {
       (Global / generatedSources) := Seq("Client", "Server"),
       (Global / extraGenerators) := Seq.empty,
       (Global / protocOptions) := Seq.empty,
-      watchSources ++= (ProjectRef(file("."), "pekko-grpc-codegen") / watchSources).value,
-      watchSources ++= (ProjectRef(file("."), "sbt-pekko-grpc") / watchSources).value)
+      watchSources ++= (ProjectRef(file("."), "codegen") / watchSources).value,
+      watchSources ++= (ProjectRef(file("."), "sbt-plugin") / watchSources).value)
 
   val setCodeGenerator = taskKey[Unit]("grpc-set-code-generator")
 
diff --git a/project/project-info.conf b/project/project-info.conf
index efecb927..0c8f7402 100644
--- a/project/project-info.conf
+++ b/project/project-info.conf
@@ -31,7 +31,7 @@ project-info {
       }
     ]
   }
-  pekko-grpc-runtime: ${project-info.shared-info} {
+  runtime: ${project-info.shared-info} {
     title: "Apache Pekko gRPC"
     jpms-name: "pekko.grpc.runtime"
     levels: [


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org