diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt deleted file mode 100644 index 5e774789b..000000000 --- a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/build.sbt +++ /dev/null @@ -1,16 +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. - */ - -// Can be removed when we move to 2.12.14 -// https://github.com/akka/akka-grpc/pull/1279 -scalaVersion := "2.12.18" - -enablePlugins(ProtocJSPlugin) // enable it first to test possibility of getting overriden - -enablePlugins(PekkoGrpcPlugin) diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/ProtocJSPlugin.scala b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/ProtocJSPlugin.scala deleted file mode 100644 index e050644dc..000000000 --- a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/ProtocJSPlugin.scala +++ /dev/null @@ -1,23 +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. - */ - -import sbt.Keys._ -import sbt._ -import sbtprotoc.ProtocPlugin -import sbtprotoc.ProtocPlugin.autoImport.PB - -object ProtocJSPlugin extends AutoPlugin { - - override def trigger: PluginTrigger = noTrigger - - override def requires: Plugins = ProtocPlugin - - override def projectSettings: Seq[Def.Setting[_]] = - Seq(Compile, Test).flatMap(inConfig(_)(PB.targets += PB.gens.js -> resourceManaged.value / "js")) -} diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/plugins.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/plugins.sbt deleted file mode 100644 index 5eb2b6556..000000000 --- a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/project/plugins.sbt +++ /dev/null @@ -1,10 +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. - */ - -addSbtPlugin("org.apache.pekko" % "pekko-grpc-sbt-plugin" % sys.props("project.version")) diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/src/main/protobuf/helloworld.proto b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/src/main/protobuf/helloworld.proto deleted file mode 100644 index 0f4426692..000000000 --- a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/src/main/protobuf/helloworld.proto +++ /dev/null @@ -1,29 +0,0 @@ -syntax = "proto3"; - -option java_multiple_files = true; -option java_package = "example.myapp.helloworld.grpc"; -option java_outer_classname = "HelloWorldProto"; - -package helloworld; - -// The greeting service definition. -service GreeterService { - // Sends a greeting - rpc SayHello (HelloRequest) returns (HelloReply) {} - - rpc ItKeepsTalking (stream HelloRequest) returns (HelloReply) {} - - rpc ItKeepsReplying (HelloRequest) returns (stream HelloReply) {} - - rpc StreamHellos (stream HelloRequest) returns (stream HelloReply) {} -} - -// The request message containing the user's name. -message HelloRequest { - string name = 1; -} - -// The response message containing the greetings -message HelloReply { - string message = 1; -} diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/src/test/protobuf/echo.proto b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/src/test/protobuf/echo.proto deleted file mode 100644 index de1aed8ea..000000000 --- a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/src/test/protobuf/echo.proto +++ /dev/null @@ -1,15 +0,0 @@ -syntax = "proto3"; - -option java_multiple_files = true; -option java_package = "example.myapp.echo.grpc"; - -package echo; - -// The greeting service definition. -service EchoService { - rpc Echo (EchoMessage) returns (EchoMessage) {} -} - -message EchoMessage { - string payload = 1; -} diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/test b/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/test deleted file mode 100644 index 50cbc18bb..000000000 --- a/sbt-plugin/src/sbt-test/gen-scala-server/06-compatibility-plugins/test +++ /dev/null @@ -1,8 +0,0 @@ -> compile - -$ exists target/scala-2.12/resource_managed/main/js/hellorequest.js -$ exists target/scala-2.12/pekko-grpc/main/example/myapp/helloworld/grpc/HelloRequest.scala - -> test:compile -$ exists target/scala-2.12/resource_managed/test/js/echomessage.js -$ exists target/scala-2.12/pekko-grpc/test/example/myapp/echo/grpc/EchoMessage.scala