Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Export play-grpc to the play org #474

Merged
merged 3 commits into from
Dec 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 0 additions & 96 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -161,96 +161,6 @@ lazy val interopTests = Project(
}
)))

lazy val playTestdata = Project(
id="akka-grpc-play-testdata",
base=file("play-testdata")
)
.settings(Dependencies.playTestdata)
.settings(commonSettings)
.settings(
crossScalaVersions := Seq(scala211, scala212),
ReflectiveCodeGen.generatedLanguages := Seq("Java", "Scala"),
ReflectiveCodeGen.extraGenerators := Seq(
"ScalaMarshallersCodeGenerator",
"akka.grpc.gen.scaladsl.play.PlayScalaServerCodeGenerator",
"akka.grpc.gen.scaladsl.play.PlayScalaClientCodeGenerator",
"akka.grpc.gen.javadsl.play.PlayJavaServerCodeGenerator",
"akka.grpc.gen.javadsl.play.PlayJavaClientCodeGenerator",
),
)
.enablePlugins(akka.grpc.NoPublish)
.pluginTestingSettings

lazy val playTestkit = Project(
id="akka-grpc-play-testkit",
base = file("play-testkit")
)
.dependsOn(runtime)
.dependsOn(playTestdata % "test")
.settings(Dependencies.playTestkit)
.settings(commonSettings)
.settings(
crossScalaVersions := Seq(scala211, scala212),
)
.pluginTestingSettings

val playSpecs2 = Project("akka-grpc-play-specs2", file("play-specs2"))
.dependsOn(playTestkit, playTestkit % "test->test")
.settings(
commonSettings,
crossScalaVersions := Seq(scala211, scala212),
Dependencies.playSpecs2,
)
.pluginTestingSettings

val playScalaTest = Project("akka-grpc-play-scalatest", file("play-scalatest"))
.dependsOn(playTestkit, playTestkit % "test->test")
.settings(
commonSettings,
crossScalaVersions := Seq(scala211, scala212),
Dependencies.playScalaTest,
excludeFilter in (Compile, headerSources) := {
val orig = (excludeFilter in (Test, headerSources)).value
// The following files have a different license
orig || "NewGuiceOneServerPerTest.scala" || "NewServerProvider.scala" || "NewBaseOneServerPerTest.scala"
},
)
.pluginTestingSettings

lazy val playInteropTestScala = Project(
id="akka-grpc-play-interop-test-scala",
base = file("play-interop-test-scala")
)
.dependsOn(playSpecs2 % Test, playScalaTest % Test)
.settings(Dependencies.playInteropTestScala)
.settings(commonSettings)
.settings(
ReflectiveCodeGen.extraGenerators := Seq(
"ScalaMarshallersCodeGenerator",
"akka.grpc.gen.scaladsl.play.PlayScalaServerCodeGenerator",
"akka.grpc.gen.scaladsl.play.PlayScalaClientCodeGenerator"
),
)
.enablePlugins(akka.grpc.NoPublish)
.pluginTestingSettings

lazy val playInteropTestJava = Project(
id="akka-grpc-play-interop-test-java",
base = file("play-interop-test-java")
)
.dependsOn(playSpecs2 % Test, playScalaTest % Test)
.settings(Dependencies.playInteropTestJava)
.settings(commonSettings)
.settings(
ReflectiveCodeGen.generatedLanguages := Seq("Java"),
ReflectiveCodeGen.extraGenerators := Seq(
"akka.grpc.gen.javadsl.play.PlayJavaServerCodeGenerator",
"akka.grpc.gen.javadsl.play.PlayJavaClientCodeGenerator",
),
)
.enablePlugins(akka.grpc.NoPublish)
.pluginTestingSettings

lazy val docs = Project(
id = "akka-grpc-docs",
base = file("docs"),
Expand Down Expand Up @@ -311,12 +221,6 @@ lazy val root = Project(
sbtPlugin,
scalapbProtocPlugin,
interopTests,
playInteropTestJava,
playInteropTestScala,
playTestkit,
playSpecs2,
playScalaTest,
playTestdata,
pluginTesterScala,
pluginTesterJava,
docs,
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/paradox/buildtools/gradle.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,4 @@ The server can then be started from the command line with:

## Play Framework support

See the @ref[Play Framework section of the docs](../play-framework.md) for details.
See the [Play gRPC docs](https://github.com/playframework/play-grpc/blob/master/docs/src/main/paradox/play-framework.md) for details.
1 change: 0 additions & 1 deletion docs/src/main/paradox/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
* [Server](server/index.md)
* [Client](client/index.md)
* [Build Tools](buildtools/index.md)
* [Akka gRPC in Play](play-framework.md)
* [gRPC API Design](apidesign.md)
* [Deployment](deploy.md)
* [Troubleshooting](troubleshooting.md)
Expand Down
4 changes: 2 additions & 2 deletions docs/src/main/paradox/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ It features:
- The service API as a @scala[Scala trait]@java[Java interface] using Akka Stream `Source`s
- On the @ref[server side](server/index.md), code to create an Akka HTTP route based on your implementation of the service
- On the @ref[client side](client/index.md) side, a client for the service
* gRPC Runtime implementation that uses Akka HTTP/2 support for the server side and grpc-netty-shaded for the client side.
* gRPC Runtime implementation that uses Akka HTTP/2 support for the server side and grpc-netty-shaded for the client side.
* Support for @ref[sbt](buildtools/sbt.md), @ref[gradle](buildtools/gradle.md), and @ref[Maven](buildtools/maven.md),
and the @ref[Play Framework](play-framework.md).
and the [Play Framework](https://github.com/playframework/play-grpc/blob/docs/docs/src/main/paradox/play-framework.md).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I somehow feel this should be more prominent, but no specific suggestions, so OK for now.


## Project Information

Expand Down
144 changes: 0 additions & 144 deletions docs/src/main/paradox/play-framework.md

This file was deleted.

This file was deleted.

38 changes: 0 additions & 38 deletions play-interop-test-java/src/main/java/controllers/MyController.java

This file was deleted.

19 changes: 0 additions & 19 deletions play-interop-test-java/src/main/protobuf/helloworld.proto

This file was deleted.

14 changes: 0 additions & 14 deletions play-interop-test-java/src/main/resources/application.conf

This file was deleted.

Loading