-
Notifications
You must be signed in to change notification settings - Fork 124
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* build plugins are still on 2.12
- Loading branch information
Showing
40 changed files
with
99 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -69,7 +69,7 @@ jobs: | |
strategy: | ||
fail-fast: false | ||
matrix: | ||
scalaVersion: [2.12, 2.13, 3.3] | ||
scalaVersion: [2.13, 3.3] | ||
steps: | ||
- name: Checkout | ||
uses: actions/[email protected] | ||
|
@@ -98,9 +98,9 @@ jobs: | |
matrix: | ||
include: | ||
- test-set: gen-scala-server | ||
scala-version: 2.12 | ||
scala-version: 2.13 | ||
- test-set: gen-java | ||
scala-version: 2.12 | ||
scala-version: 2.13 | ||
- test-set: scala-2_13 | ||
scala-version: 2.13 | ||
- test-set: scala3 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
> compile | ||
|
||
$ exists target/scala-2.12/akka-grpc | ||
$ exists target/scala-2.12/akka-grpc/main/example/myapp/helloworld/grpc/HelloRequest.java | ||
$ exists target/scala-2.12/akka-grpc/main/example/myapp/helloworld/grpc/HelloReply.java | ||
$ exists target/scala-2.12/akka-grpc/main/example/myapp/helloworld/grpc/GreeterService.java | ||
$ exists target/scala-2.12/akka-grpc/main/example/myapp/helloworld/grpc/GreeterServiceClient.java | ||
$ exists target/scala-2.13/akka-grpc | ||
$ exists target/scala-2.13/akka-grpc/main/example/myapp/helloworld/grpc/HelloRequest.java | ||
$ exists target/scala-2.13/akka-grpc/main/example/myapp/helloworld/grpc/HelloReply.java | ||
$ exists target/scala-2.13/akka-grpc/main/example/myapp/helloworld/grpc/GreeterService.java | ||
$ exists target/scala-2.13/akka-grpc/main/example/myapp/helloworld/grpc/GreeterServiceClient.java | ||
|
||
> doc |
4 changes: 1 addition & 3 deletions
4
sbt-plugin/src/sbt-test/gen-java/02-server-reflection/build.sbt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
> compile | ||
|
||
$ exists target/scala-2.12/akka-grpc | ||
$ exists target/scala-2.12/akka-grpc/main/example/myapp/helloworld/grpc/HelloRequest.java | ||
$ exists target/scala-2.12/akka-grpc/main/example/myapp/helloworld/grpc/HelloReply.java | ||
$ exists target/scala-2.12/akka-grpc/main/example/myapp/helloworld/grpc/GreeterService.java | ||
$ exists target/scala-2.12/akka-grpc/main/example/myapp/helloworld/grpc/GreeterServiceClient.java | ||
$ exists target/scala-2.13/akka-grpc | ||
$ exists target/scala-2.13/akka-grpc/main/example/myapp/helloworld/grpc/HelloRequest.java | ||
$ exists target/scala-2.13/akka-grpc/main/example/myapp/helloworld/grpc/HelloReply.java | ||
$ exists target/scala-2.13/akka-grpc/main/example/myapp/helloworld/grpc/GreeterService.java | ||
$ exists target/scala-2.13/akka-grpc/main/example/myapp/helloworld/grpc/GreeterServiceClient.java |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
> compile | ||
|
||
$ exists target/scala-2.12/akka-grpc/main/helloworld/Helloworld.java | ||
$ exists target/scala-2.13/akka-grpc/main/helloworld/Helloworld.java |
4 changes: 1 addition & 3 deletions
4
sbt-plugin/src/sbt-test/gen-java/04-crash-on-keywords/build.sbt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 1 addition & 3 deletions
4
sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/build.sbt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
sbt-plugin/src/sbt-test/gen-java/05-duplicate-messages-different-packages/test
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
> compile | ||
|
||
$ exists target/scala-2.12/akka-grpc/main/helloworld/Helloworld.java | ||
$ exists target/scala-2.13/akka-grpc/main/helloworld/Helloworld.java |
2 changes: 2 additions & 0 deletions
2
sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
scalaVersion := "2.13.11" | ||
|
||
resolvers += Resolver.sonatypeRepo("staging") | ||
|
||
scalacOptions += "-Xfatal-warnings" | ||
|
10 changes: 5 additions & 5 deletions
10
sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/test
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
> compile | ||
|
||
$ exists target/scala-2.12/akka-grpc | ||
$ exists target/scala-2.12/akka-grpc/main/example/myapp/helloworld/grpc/HelloRequest.scala | ||
$ exists target/scala-2.12/akka-grpc/main/example/myapp/helloworld/grpc/HelloworldProto.scala | ||
$ exists target/scala-2.12/akka-grpc/main/example/myapp/helloworld/grpc/GreeterService.scala | ||
$ exists target/scala-2.13/akka-grpc | ||
$ exists target/scala-2.13/akka-grpc/main/example/myapp/helloworld/grpc/HelloRequest.scala | ||
$ exists target/scala-2.13/akka-grpc/main/example/myapp/helloworld/grpc/HelloworldProto.scala | ||
$ exists target/scala-2.13/akka-grpc/main/example/myapp/helloworld/grpc/GreeterService.scala | ||
|
||
# This will for example detect when we publish generated code that is | ||
# already in scalapb-runtime | ||
> assembly | ||
|
||
# catch scaladoc errors | ||
> doc | ||
> doc |
2 changes: 2 additions & 0 deletions
2
sbt-plugin/src/sbt-test/gen-scala-server/02-multiple-services/build.sbt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
scalaVersion := "2.13.11" | ||
|
||
resolvers += Resolver.sonatypeRepo("staging") | ||
|
||
enablePlugins(AkkaGrpcPlugin) |
2 changes: 2 additions & 0 deletions
2
sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/build.sbt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
scalaVersion := "2.13.11" | ||
|
||
resolvers += Resolver.sonatypeRepo("staging") | ||
|
||
enablePlugins(AkkaGrpcPlugin) | ||
|
12 changes: 6 additions & 6 deletions
12
sbt-plugin/src/sbt-test/gen-scala-server/03-test-config/test
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,15 @@ | ||
> test:compile | ||
|
||
# the Scala server was generated in Compile | ||
$ exists target/scala-2.12/akka-grpc/main/example/myapp/helloworld/grpc/GreeterServiceHandler.scala | ||
$ exists target/scala-2.13/akka-grpc/main/example/myapp/helloworld/grpc/GreeterServiceHandler.scala | ||
|
||
# only the Scala client was generated in Test | ||
-$ exists target/scala-2.12/akka-grpc/test/example/myapp/helloworld/grpc/GreeterServiceHandler.scala | ||
$ exists target/scala-2.12/akka-grpc/test/example/myapp/helloworld/grpc/GreeterServiceClient.scala | ||
-$ exists target/scala-2.13/akka-grpc/test/example/myapp/helloworld/grpc/GreeterServiceHandler.scala | ||
$ exists target/scala-2.13/akka-grpc/test/example/myapp/helloworld/grpc/GreeterServiceClient.scala | ||
|
||
> it:protocGenerate | ||
|
||
# only the Java server was generated in IntegrationTest | ||
-$ exists target/scala-2.12/akka-grpc/it/example/myapp/helloworld/grpc/GreeterServiceHandler.scala | ||
-$ exists target/scala-2.12/akka-grpc/it/example/myapp/helloworld/grpc/GreeterServiceClient.scala | ||
$ exists target/scala-2.12/akka-grpc/it/example/myapp/helloworld/grpc/GreeterServiceHandlerFactory.java | ||
-$ exists target/scala-2.13/akka-grpc/it/example/myapp/helloworld/grpc/GreeterServiceHandler.scala | ||
-$ exists target/scala-2.13/akka-grpc/it/example/myapp/helloworld/grpc/GreeterServiceClient.scala | ||
$ exists target/scala-2.13/akka-grpc/it/example/myapp/helloworld/grpc/GreeterServiceHandlerFactory.java |
2 changes: 2 additions & 0 deletions
2
sbt-plugin/src/sbt-test/gen-scala-server/04-server-reflection/build.sbt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
scalaVersion := "2.13.11" | ||
|
||
resolvers += Resolver.sonatypeRepo("staging") | ||
|
||
enablePlugins(AkkaGrpcPlugin) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.