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 822aba0c remove use of differentiated scala 2.12/2.13 code (#602)
822aba0c is described below
commit 822aba0c5a1b70373f6e12cb2aea86dd965f3240
Author: PJ Fanning <[email protected]>
AuthorDate: Thu Jan 22 10:47:33 2026 +0100
remove use of differentiated scala 2.12/2.13 code (#602)
* reduce use of differentiated scala 2.12/2.13 code
* Update CodeGenerator.scala
---
build.sbt | 9 +---
.../org/apache/pekko/grpc/gen/CodeGenerator.scala | 48 ----------------------
.../org/apache/pekko/grpc/gen/CodeGenerator.scala | 0
3 files changed, 1 insertion(+), 56 deletions(-)
diff --git a/build.sbt b/build.sbt
index 169d6bdc..51bc6547 100644
--- a/build.sbt
+++ b/build.sbt
@@ -78,14 +78,7 @@ lazy val codegen = Project(id = "codegen", base =
file("codegen"))
case _ =>
MergeStrategy.deduplicate
},
crossScalaVersions := Dependencies.Versions.CrossScalaForPlugin,
- scalaVersion := scala212,
- Compile / unmanagedSourceDirectories ++= {
- if (scalaBinaryVersion.value == "2.12") {
- Seq.empty
- } else {
- Seq(project.base / "src" / "main" / "scala-2.13+")
- }
- })
+ scalaVersion := scala212)
.settings(addArtifact(Compile / assembly / artifact, assembly))
.settings(addArtifact(sbt.Artifact(pekkoGrpcCodegenId, "bat", "bat", "bat"),
mkBatAssemblyTask))
diff --git
a/codegen/src/main/scala-2.13+/org/apache/pekko/grpc/gen/CodeGenerator.scala
b/codegen/src/main/scala-2.13+/org/apache/pekko/grpc/gen/CodeGenerator.scala
deleted file mode 100644
index 0859ce79..00000000
--- a/codegen/src/main/scala-2.13+/org/apache/pekko/grpc/gen/CodeGenerator.scala
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * license agreements; and to You under the Apache License, version 2.0:
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * This file is part of the Apache Pekko project, which was derived from Akka.
- */
-
-/*
- * Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
- */
-
-package org.apache.pekko.grpc.gen
-
-import com.google.protobuf.ExtensionRegistry
-import com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest
-import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse
-import protocbridge.Artifact
-
-/**
- * Code generator trait that is not directly bound to scala-pb or protoc
(other than the types).
- */
-trait CodeGenerator {
- import CodeGenerator._
-
- /** Generator name; example: `pekko-grpc-scala` */
- def name: String
-
- def run(request: CodeGeneratorRequest, logger: Logger): CodeGeneratorResponse
-
- /** Takes Scala binary version and returns suggested dependency Seq */
- def suggestedDependencies: ScalaBinaryVersion => Seq[Artifact]
-
- def registerExtensions(registry: ExtensionRegistry): Unit = {}
-
- final def run(request: Array[Byte], logger: Logger): Array[Byte] = {
- val registry = ExtensionRegistry.newInstance
- registerExtensions(registry)
- run(CodeGeneratorRequest.parseFrom(request, registry), logger:
Logger).toByteArray
- }
-}
-
-object CodeGenerator {
-
- /** Holds the prefix of a given Scala binary version */
- case class ScalaBinaryVersion(prefix: String)
-}
diff --git
a/codegen/src/main/scala-2.12/org/apache/pekko/grpc/gen/CodeGenerator.scala
b/codegen/src/main/scala/org/apache/pekko/grpc/gen/CodeGenerator.scala
similarity index 100%
rename from
codegen/src/main/scala-2.12/org/apache/pekko/grpc/gen/CodeGenerator.scala
rename to codegen/src/main/scala/org/apache/pekko/grpc/gen/CodeGenerator.scala
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
