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.

Sign up for GitHub

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

Jump to bottom

Re-enable play-grpc samples #81

Merged
merged 2 commits into from
Dec 26, 2019
Merged

Re-enable play-grpc samples #81

merged 2 commits into from
Dec 26, 2019

Conversation

octonato
Copy link
Contributor

No description provided.

octonato
octonato commented Dec 23, 2019
View reviewed changes
play-java-grpc-example/project/plugins.sbt
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.0")
enablePlugins(BuildInfoPlugin)
val playGrpcV = "0.8.1"
buildInfoKeys := Seq[BuildInfoKey]("playGrpcVersion" -> playGrpcV)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The gRPC version is used in the plugin file and in the project itself. To avoid adding the version in many places, I'm adding it on BuildInfo and reusing it.

dwijnand
dwijnand approved these changes Dec 23, 2019
View reviewed changes
play-scala-grpc-example/project/Dependencies.scala Outdated
"com.typesafe.play" %% "play-specs2" % playVersion % Test,
"org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test,
)
}
Copy link
Member

Choose a reason for hiding this comment

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

I dislike this setup as (in my eyes) it needlessly splits the build into multiple files. Perhaps there's value in it when you have a build as large as Play/Lagom, but within an sample project it seems to me even more needless.

That said, it's no blocker to the progress being landed with this! Clear for landing!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can move it back, no problem

@dwijnand dwijnand merged commit ca100cc into playframework:2.8.x Dec 26, 2019
ignasi35 pushed a commit to ignasi35/play-samples that referenced this pull request May 20, 2020
@octonato @mergify
Updated with template-control on 2019-01-08T14:44:42.531Z (playframew…
13047a5 
…ork#81)

**/plugins.sbt:
    addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
  **build.gradle:
    def playVersion = "2.6.21"
ignasi35 pushed a commit to ignasi35/play-samples that referenced this pull request May 20, 2020
@octonato @mergify
Updated with template-control on 2019-01-08T14:44:42.104Z (playframew…
f1fbcf0 
…ork#81)

**/plugins.sbt:
    addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
  **build.gradle:
    def playVersion = "2.6.21"
  **build.gradle:
        playTest "org.scalatestplus.play:scalatestplus-play_\$scalaVersion:3.1.2"
ignasi35 pushed a commit to ignasi35/play-samples that referenced this pull request May 20, 2020
@octonato
Merge pull request playframework#81 from renatocaval/templatecontrol-…
096759f 
…2.6.x

Upgrade branch 2.6.x using TemplateControl
ignasi35 pushed a commit to ignasi35/play-samples that referenced this pull request May 20, 2020
@marcospereira
Updated with template-control on 2019-02-13T20:25:39.687Z (playframew…
cce55be 
…ork#81)

/.mergify.yml:
    wrote /.mergify.yml
ignasi35 pushed a commit to ignasi35/play-samples that referenced this pull request May 20, 2020
@marcospereira
Updated with template-control on 2019-02-13T20:25:39.721Z (playframew…
c92efd2 
…ork#81)

/.mergify.yml:
    wrote /.mergify.yml
ignasi35 pushed a commit to ignasi35/play-samples that referenced this pull request May 20, 2020
@dwijnand
Merge remote-tracking branch 'play-java-jpa-example/2.6.x' into 2.6.x
3d9fb36 
* play-java-jpa-example/2.6.x: (48 commits)
  Nest play-java-jpa-example
  Updated with template-control on 2019-02-13T20:25:39.298Z (playframework#87)
  Upgrade branch 2.6.x using TemplateControl (playframework#85)
  Upgrade branch 2.6.x using TemplateControl (playframework#84)
  Upgrade branch 2.6.x using TemplateControl (playframework#83)
  Updated with template-control on 2019-01-08T14:44:42.531Z (playframework#81)
  Updated with template-control on 2019-01-04T17:13:23.827Z (playframework#76)
  Upgrade branch 2.6.x using TemplateControl (playframework#71)
  Upgrade branch 2.6.x using TemplateControl (playframework#69)
  Updated with template-control on 2018-09-11T20:14:50.333Z (playframework#65)
  Updated with template-control on 2018-08-20T20:37:13.878Z (playframework#63)
  Updated with template-control on 2018-07-19T01:58:55.873Z (playframework#61)
  Updated with template-control on 2018-07-16T18:38:45.441Z (playframework#60)
  Upgrade branch 2.6.x using TemplateControl (playframework#59)
  Updated with template-control on 2018-05-27T23:54:09.603Z (playframework#58)
  Updated with template-control on 2018-04-06T19:34:58.092Z (playframework#55)
  Updated with template-control on 2018-03-02T18:56:28.087Z (playframework#54)
  Upgrade branch 2.6.x using TemplateControl (playframework#53)
  Fix cross build to sbt 1.1.0 (playframework#52)
  Upgrade branch 2.6.x using TemplateControl (playframework#51)
  ...
ignasi35 pushed a commit to ignasi35/play-samples that referenced this pull request May 20, 2020
@dwijnand
Merge remote-tracking branch 'play-java-rest-api-example/2.6.x' into …
90cb777 
…2.6.x

* play-java-rest-api-example/2.6.x: (61 commits)
  Nest play-java-rest-api-example
  Updated with template-control on 2019-02-13T20:25:39.721Z (playframework#81)
  Upgrade branch 2.6.x using TemplateControl (playframework#79)
  Updated with template-control on 2019-01-17T15:10:58.259Z   /.mergify.yml:     wrote /.mergify.yml
  Updated with template-control on 2019-01-16T12:08:46.124Z   /LICENSE:     wrote /LICENSE   /NOTICE:     wrote /NOTICE   /.mergify.yml:     wrote /.mergify.yml   **build.sbt:     scalaVersion := "2.12.8"   **build.gradle:         playTest "io.gatling.highcharts:gatling-charts-highcharts:$gatlingVersion"   **build.gradle:         playTest "io.gatling:gatling-test-framework:$gatlingVersion"
  Upgrade branch 2.6.x using TemplateControl (playframework#74)
  Upgrade branch 2.6.x using TemplateControl (playframework#65)
  fixing wrong template-ctrl replacement
  Updated with template-control on 2018-11-29T16:03:57.787Z   /.mergify.yml:     wrote /.mergify.yml   **build.sbt:     scalaVersion := "2.12.7"   **/build.properties:     sbt.version=1.2.6
  removed jdk 9 and 10
  removed misterious GatlingSpec
  fixed build.sbt
  Updated with template-control on 2018-11-16T14:25:15.563Z   **build.sbt:     scalaVersion := "2.12.6"   **/plugins.sbt:     addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.20")   **build.gradle:     def playVersion = "2.6.20"
  Upgrade branch 2.6.x using TemplateControl (playframework#55)
  Upgrade branch 2.6.x using TemplateControl (playframework#54)
  Upgrade branch 2.6.x using TemplateControl (playframework#51)
  Upgrade branch 2.6.x using TemplateControl (playframework#50)
  Upgrade branch 2.6.x using TemplateControl (playframework#49)
  Correct scalaVersion setting
  Revert gatling version changes
  ...
ignasi35 pushed a commit to ignasi35/play-samples that referenced this pull request May 20, 2020
@dwijnand
Merge remote-tracking branch 'play-java-starter-example/2.6.x' into 2…
28a452d 
….6.x

* play-java-starter-example/2.6.x: (57 commits)
  Nest play-java-starter-example
  Updated with template-control on 2019-02-13T20:25:39.664Z (playframework#103)
  Upgrade branch 2.6.x using TemplateControl (playframework#99)
  Upgrade branch 2.6.x using TemplateControl (playframework#98)
  Upgrade branch 2.6.x using TemplateControl (playframework#97)
  Updated with template-control on 2019-01-08T14:44:42.254Z (playframework#95)
  Updated with template-control on 2019-01-04T17:13:24.036Z (playframework#90)
  Upgrade branch 2.6.x using TemplateControl (playframework#89)
  Improve README (playframework#81)
  Upgrade branch 2.6.x using TemplateControl (playframework#79)
  Updated with template-control on 2018-09-11T20:14:50.628Z (playframework#78)
  Updated with template-control on 2018-08-20T20:37:14.072Z (playframework#77)
  Updated with template-control on 2018-07-19T01:58:56.147Z (playframework#74)
  Updated with template-control on 2018-07-16T18:38:45.658Z (playframework#73)
  Upgrade branch 2.6.x using TemplateControl (playframework#71)
  Updated with template-control on 2018-05-27T23:54:09.356Z (playframework#69)
  Updated with template-control on 2018-04-06T19:34:58.808Z (playframework#66)
  Change disabled to enabled (playframework#64)
  Use discuss forum (playframework#62)
  Enable localhost:9000 as allowed host by default. (playframework#61)
  ...
ignasi35 pushed a commit to ignasi35/play-samples that referenced this pull request May 20, 2020
@dwijnand
Merge remote-tracking branch 'play-java-streaming-example/2.6.x' into…
9f32627 
… 2.6.x

* play-java-streaming-example/2.6.x: (45 commits)
  Nest play-java-streaming-example
  Updated with template-control on 2019-02-13T20:25:39.687Z (playframework#81)
  Upgrade branch 2.6.x using TemplateControl (playframework#79)
  Upgrade branch 2.6.x using TemplateControl (playframework#78)
  Upgrade branch 2.6.x using TemplateControl (playframework#77)
  Updated with template-control on 2019-01-08T14:44:41.668Z (playframework#75)
  Updated with template-control on 2019-01-04T17:13:23.629Z (playframework#70)
  Upgrade branch 2.6.x using TemplateControl (playframework#69)
  Upgrade branch 2.6.x using TemplateControl (playframework#66)
  Updated with template-control on 2018-09-11T20:14:50.512Z (playframework#65)
  Updated with template-control on 2018-08-20T20:37:13.644Z (playframework#64)
  Updated with template-control on 2018-07-19T01:58:55.832Z (playframework#62)
  Updated with template-control on 2018-07-16T18:38:45.449Z (playframework#61)
  Upgrade branch 2.6.x using TemplateControl (playframework#60)
  Updated with template-control on 2018-05-27T23:54:09.459Z (playframework#59)
  Updated with template-control on 2018-04-06T19:34:58.233Z (playframework#57)
  Updated with template-control on 2018-03-02T18:56:28.174Z (playframework#56)
  Upgrade branch 2.6.x using TemplateControl (playframework#55)
  Fix cross build to sbt 1.1.0 (playframework#54)
  Upgrade branch 2.6.x using TemplateControl (playframework#53)
  ...
ignasi35 pushed a commit to ignasi35/play-samples that referenced this pull request May 20, 2020
@dwijnand
Merge remote-tracking branch 'play-java-websocket-example/2.6.x' into…
3a42d9c 
… 2.6.x

* play-java-websocket-example/2.6.x: (83 commits)
  Nest play-java-websocket-example
  Updated with template-control on 2019-02-13T20:25:39.721Z (playframework#100)
  Upgrade branch 2.6.x using TemplateControl (playframework#96)
  Upgrade branch 2.6.x using TemplateControl (playframework#94)
  Upgrade branch 2.6.x using TemplateControl (playframework#93)
  Updated with template-control on 2019-01-08T14:44:42.192Z (playframework#90)
  Updated with template-control on 2019-01-04T17:13:23.935Z (playframework#85)
  Upgrade branch 2.6.x using TemplateControl (playframework#84)
  Upgrade branch 2.6.x using TemplateControl (playframework#81)
  Updated with template-control on 2018-09-11T20:14:50.523Z (playframework#79)
  Updated with template-control on 2018-08-20T20:37:13.896Z (playframework#78)
  Updated with template-control on 2018-07-19T01:58:55.842Z (playframework#76)
  Updated with template-control on 2018-07-16T18:38:45.656Z (playframework#75)
  Upgrade branch 2.6.x using TemplateControl (playframework#74)
  Updated with template-control on 2018-05-27T23:54:09.712Z (playframework#73)
  Updated with template-control on 2018-04-06T19:34:58.514Z (playframework#71)
  Updated with template-control on 2018-03-02T18:56:28.527Z (playframework#70)
  Upgrade branch 2.6.x using TemplateControl (playframework#69)
  Fix cross build to sbt 1.1.0 (playframework#68)
  Upgrade branch 2.6.x using TemplateControl (playframework#67)
  ...
ignasi35 pushed a commit to ignasi35/play-samples that referenced this pull request May 20, 2020
@dwijnand
Merge remote-tracking branch 'play-scala-anorm-example/2.6.x' into 2.6.x
18b40b7 
* play-scala-anorm-example/2.6.x: (68 commits)
  Nest play-scala-anorm-example
  Updated with template-control on 2019-02-13T20:25:39.764Z (playframework#105)
  Upgrade branch 2.6.x using TemplateControl (playframework#102)
  Upgrade branch 2.6.x using TemplateControl (playframework#101)
  Upgrade branch 2.6.x using TemplateControl (playframework#100)
  Updated with template-control on 2019-01-08T14:44:41.925Z (playframework#98)
  Updated with template-control on 2019-01-04T17:13:23.631Z (playframework#95)
  Fix deprecated WithResult.fold method usage (playframework#94)
  Upgrade branch 2.6.x using TemplateControl (playframework#93)
  Upgrade branch 2.6.x using TemplateControl (playframework#90)
  Updated with template-control on 2018-09-11T20:14:50.057Z (playframework#89)
  Fix cross build to sbt 1.1.0 (playframework#76)
  Updated with template-control on 2018-07-19T01:58:55.836Z (playframework#87)
  Updated with template-control on 2018-07-16T18:38:45.458Z (playframework#86)
  Upgrade branch 2.6.x using TemplateControl (playframework#85)
  Updated with template-control on 2018-05-27T23:54:09.813Z (playframework#84)
  Updated with template-control on 2018-04-06T19:34:57.924Z (playframework#80)
  Update the README (playframework#82)
  Upgrade Anorm dependency and usage (playframework#81)
  link to playframework version of anorm (playframework#79)
  ...
ignasi35 pushed a commit to ignasi35/play-samples that referenced this pull request May 20, 2020
@dwijnand
Merge remote-tracking branch 'play-scala-compile-di-example/2.6.x' in…
8903bb9 
…to 2.6.x

* play-scala-compile-di-example/2.6.x: (66 commits)
  Nest play-scala-compile-di-example
  Updated with template-control on 2019-02-13T20:25:39.413Z (playframework#87)
  Updated with template-control on 2019-02-01T10:40:33.389Z   /.mergify.yml:     wrote /.mergify.yml
  Updated with template-control on 2019-01-17T15:10:58.005Z   /.mergify.yml:     wrote /.mergify.yml
  Updated with template-control on 2019-01-16T12:08:45.884Z   /LICENSE:     wrote /LICENSE   /NOTICE:     wrote /NOTICE   /.mergify.yml:     wrote /.mergify.yml   **build.gradle:         playTest "org.scalatestplus.play:scalatestplus-play_$scalaVersion:3.1.2"
  Updated with template-control on 2019-01-08T14:44:42.104Z (playframework#81)
  Updated with template-control on 2019-01-04T17:13:23.804Z (playframework#76)
  Drop oraclejdk10
  Updated with template-control on 2018-11-29T15:50:43.529Z   /.mergify.yml:     wrote /.mergify.yml   **build.sbt:     scalaVersion := "2.12.7"
  Made minor changes to the README file documentation
  Updated with template-control on 2018-10-08T19:11:41.162Z   **/plugins.sbt:     addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.20")   **build.gradle:     def playVersion = "2.6.20"
  Updated with template-control on 2018-09-11T20:14:49.815Z (playframework#69)
  Updated with template-control on 2018-08-20T20:37:13.694Z (playframework#68)
  Updated with template-control on 2018-07-19T01:58:55.403Z (playframework#66)
  Updated with template-control on 2018-07-16T18:38:45.033Z (playframework#65)
  Upgrade branch 2.6.x using TemplateControl (playframework#64)
  Updated with template-control on 2018-05-27T23:54:09.150Z (playframework#63)
  Updated with template-control on 2018-04-06T19:34:58.408Z (playframework#61)
  Updated with template-control on 2018-03-02T18:56:27.945Z (playframework#60)
  Upgrade branch 2.6.x using TemplateControl (playframework#59)
  ...
ignasi35 pushed a commit to ignasi35/play-samples that referenced this pull request May 20, 2020
@dwijnand
Merge remote-tracking branch 'play-scala-secure-session-example/2.6.x…
fff317a 
…' into 2.6.x

* play-scala-secure-session-example/2.6.x: (70 commits)
  Nest play-scala-secure-session-example
  Updated with template-control on 2019-02-13T20:17:46.435Z (playframework#95)
  Updated with template-control on 2019-02-01T10:40:32.758Z (playframework#93)
  Upgrade branch 2.6.x using TemplateControl (playframework#92)
  Upgrade branch 2.6.x using TemplateControl (playframework#91)
  Upgrade branch 2.6.x using TemplateControl (playframework#89)
  Upgrade branch 2.6.x using TemplateControl (playframework#82)
  Upgrade branch 2.6.x using TemplateControl (playframework#81)
  adds mergify file (playframework#79)
  Upgrade branch 2.6.x using TemplateControl (playframework#77)
  Updated with template-control on 2018-08-20T20:37:13.861Z (playframework#71)
  Updated with template-control on 2018-07-19T01:58:55.998Z (playframework#69)
  Updated with template-control on 2018-07-16T18:38:45.458Z (playframework#68)
  Upgrade branch 2.6.x using TemplateControl (playframework#66)
  Updated with template-control on 2018-05-27T23:54:09.617Z (playframework#65)
  Updated with template-control on 2018-04-06T19:34:58.475Z (playframework#63)
  Updated with template-control on 2018-03-02T18:56:28.210Z (playframework#62)
  Upgrade branch 2.6.x using TemplateControl (playframework#61)
  Fix cross build to sbt 1.1.0 (playframework#60)
  Upgrade branch 2.6.x using TemplateControl (playframework#59)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dwijnand dwijnand dwijnand approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@octonato @dwijnand