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

Use Scala 2.13 in the REST samples #37

Merged
merged 10 commits into from
Jul 3, 2019
Merged

Use Scala 2.13 in the REST samples #37

merged 10 commits into from
Jul 3, 2019

Conversation

marcospereira
Copy link
Member

@marcospereira marcospereira commented Jul 3, 2019 •
edited by dwijnand
Loading

Follow up to #36.

@marcospereira
Isolate Gatling tests in another project
7eaed51 
The idea is that this project can use whichever version of
Scala is supported by Gatling. This commit also updates the
Scala version to be 2.13, and updates Play to 2.8.0-M2.

Finally, some minor refactoring was done in the Gatling
test to make it simpler.
@marcospereira
Add log configuration for Gatling subproject
4304b11
@marcospereira
Document how to run Gatling tests
c1c1861
@marcospereira
Scala REST: build using Scala 2.13
2caeb30
@marcospereira
Remove invalid param
3e527c7
@marcospereira
Fix readme and docs small issues
b04d88f
@marcospereira
Add gatling logging configuration
81f3d13
@marcospereira
Update gatling
09ccbeb
@marcospereira
Gatling validation for Scala REST sample
ccbd74d
@marcospereira
Fix wrong link
42538fd
@dwijnand

This comment has been minimized.

Sign in to view
@marcospereira marcospereira mentioned this pull request Jul 3, 2019
Merged
ignasi35
ignasi35 approved these changes Jul 3, 2019
View reviewed changes
Copy link
Member

@ignasi35 ignasi35 left a comment

Choose a reason for hiding this comment

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

Just a minor comment wrt README maintenance cost (a link with a 2.7.x). We can fix on a separate PR.

play-java-rest-api-example/scripts/test-sbt
sbt ++$TRAVIS_SCALA_VERSION test

# At least verifies that Gatling tests are compiling
sbt ++$TRAVIS_SCALA_VERSION ";project gatling; gatling:compile"
Copy link
Member

Choose a reason for hiding this comment

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

Oh, wow. That's a change...

Copy link
Member

Choose a reason for hiding this comment

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

Hmmm, maybe I misundertstood.

Is this change required because of the change in the gatling version or was this a bug in the script (not running gatling and doing a noop test)?

play-scala-rest-api-example/README.md

### Usage

If you call the same URL from the command line, you’ll see JSON. Using httpie, we can execute the command:
If you call the same URL from the command line, you’ll see JSON. Using [httpie](https://httpie.org/), we can execute the command:
Copy link
Member

Choose a reason for hiding this comment

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

nice!

play-java-rest-api-example/build.sbt
javacOptions ++= Seq(
"-Xlint:unchecked",
"-Xlint:deprecation"
)
Copy link
Member

Choose a reason for hiding this comment

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

This is great. We should be more disciplined with what idioms we recommend for sbt code.

play-java-rest-api-example/README.md
@@ -1,6 +1,6 @@
# play-java-rest-api-example

A REST API showing Play with a JPA backend. For the Scala version, please see <https://github.com/playframework/play-scala-rest-api-example>.
A REST API showing Play with a JPA backend. For the Scala version, please see <https://github.com/playframework/play-samples/tree/2.7.x/play-scala-rest-api-example>.
Copy link
Member

Choose a reason for hiding this comment

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

use a relative path to decrease maintenance cost?

play-scala-rest-api-example/docs/src/main/paradox/appendix.md
@@ -14,7 +14,8 @@ You will need to have [git](https://git-scm.com/) installed.
You can clone the example project from GitHub:

```bash
git clone https://github.com/playframework/play-scala-rest-api-example.git
git clone https://github.com/playframework/play-samples.git
cd play-scala-rest-api-example
Copy link
Member

Choose a reason for hiding this comment

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

👍🏼

@ignasi35 ignasi35 merged commit 2a21e81 into playframework:2.7.x Jul 3, 2019
@marcospereira marcospereira deleted the issues/34/2.7.x/play-rest-isolate-gatling branch July 4, 2019 20:52
@marcospereira marcospereira mentioned this pull request Jul 26, 2019
Closed
octonato added a commit to octonato/play-samples that referenced this pull request Dec 4, 2019
@octonato
Upgrade branch 2.6.x using TemplateControl (playframework#37)
5c2daeb 
```
Updated with template-control on 2019-02-01T10:40:32.809Z
  /.mergify.yml:
    wrote /.mergify.yml

```
octonato pushed a commit to octonato/play-samples that referenced this pull request Dec 4, 2019
@dwijnand
Merge remote-tracking branch 'play-java-compile-di-example/2.6.x' int…
2119ef9 
…o 2.6.x

* play-java-compile-di-example/2.6.x: (44 commits)
  Nest play-java-compile-di-example
  Updated with template-control on 2019-02-13T20:25:39.247Z (playframework#53)
  Upgrade branch 2.6.x using TemplateControl (playframework#51)
  Updated with template-control on 2019-01-17T15:10:57.466Z   /.mergify.yml:     wrote /.mergify.yml
  Updated with template-control on 2019-01-16T12:08:45.201Z   /LICENSE:     wrote /LICENSE   /NOTICE:     wrote /NOTICE   /.mergify.yml:     wrote /.mergify.yml
  Upgrade branch 2.6.x using TemplateControl (playframework#47)
  Updated with template-control on 2019-01-04T17:13:23.849Z (playframework#42)
  Remove oraclejdk10 (EOLed)
  Updated with template-control on 2018-11-29T15:50:43.084Z   /.mergify.yml:     wrote /.mergify.yml   **build.sbt:     scalaVersion := "2.12.7"
  Updated with template-control on 2018-10-08T19:11:40.693Z   **/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.826Z (playframework#37)
  Updated with template-control on 2018-08-20T20:37:13.525Z (playframework#36)
  Updated with template-control on 2018-07-19T01:58:55.323Z (playframework#34)
  Updated with template-control on 2018-07-16T18:38:44.960Z (playframework#33)
  Upgrade branch 2.6.x using TemplateControl (playframework#32)
  Updated with template-control on 2018-05-27T23:54:09.062Z (playframework#31)
  Updated with template-control on 2018-04-06T19:34:57.520Z (playframework#29)
  Updated with template-control on 2018-03-02T18:56:27.911Z (playframework#28)
  Upgrade branch 2.6.x using TemplateControl (playframework#27)
  Fix cross build to sbt 1.1.0 (playframework#26)
  ...
octonato pushed a commit to octonato/play-samples that referenced this pull request Dec 4, 2019
@dwijnand
Merge remote-tracking branch 'play-scala-forms-example/2.6.x' into 2.6.x
68faf34 
* play-scala-forms-example/2.6.x: (43 commits)
  Nest play-scala-forms-example
  Updated with template-control on 2019-02-13T20:25:39.527Z (playframework#57)
  Upgrade branch 2.6.x using TemplateControl (playframework#55)
  Updated with template-control on 2019-01-17T15:10:57.862Z   /.mergify.yml:     wrote /.mergify.yml
  Updated with template-control on 2019-01-16T12:08:45.677Z   /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.058Z   **/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"
  Updated with template-control on 2019-01-04T17:13:23.715Z (playframework#48)
  Upgrade branch 2.6.x using TemplateControl (playframework#47)
  Updated with template-control on 2018-10-08T19:11:40.851Z   **/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.844Z (playframework#43)
  Updated with template-control on 2018-08-20T20:37:13.701Z (playframework#42)
  Updated with template-control on 2018-07-19T01:58:55.810Z (playframework#40)
  Updated with template-control on 2018-07-16T18:38:45.350Z (playframework#39)
  Upgrade branch 2.6.x using TemplateControl (playframework#38)
  Updated with template-control on 2018-05-27T23:54:09.254Z (playframework#37)
  Updated with template-control on 2018-04-06T19:34:57.899Z (playframework#34)
  Updated with template-control on 2018-03-02T18:56:27.993Z (playframework#33)
  Upgrade branch 2.6.x using TemplateControl (playframework#32)
  Fix cross build to sbt 1.1.0 (playframework#31)
  Fixed typos, formatting (playframework#30)
  ...
octonato pushed a commit to octonato/play-samples that referenced this pull request Dec 4, 2019
@dwijnand
Merge remote-tracking branch 'play-scala-log4j2-example/2.6.x' into 2…
3adb946 
….6.x

* play-scala-log4j2-example/2.6.x: (36 commits)
  Nest play-scala-log4j2-example
  Updated with template-control on 2019-02-13T20:25:39.787Z (playframework#39)
  Upgrade branch 2.6.x using TemplateControl (playframework#37)
  Updated with template-control on 2019-01-17T15:10:57.918Z   /.mergify.yml:     wrote /.mergify.yml
  Updated with template-control on 2019-01-16T12:08:45.730Z   /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:41.516Z (playframework#33)
  Updated with template-control on 2019-01-04T17:13:24.081Z (playframework#28)
  Remove JDK 9 & 10
  Updated with template-control on 2018-11-29T15:50:43.150Z   /.mergify.yml:     wrote /.mergify.yml
  Updated with template-control on 2018-10-08T19:11:41.210Z   **/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:50.549Z (playframework#23)
  set log4j2.xml as javaOptions (playframework#20)
  Updated with template-control on 2018-08-20T20:37:13.971Z (playframework#22)
  Updated with template-control on 2018-07-19T01:58:55.708Z (playframework#19)
  Updated with template-control on 2018-07-16T18:38:45.739Z (playframework#18)
  Upgrade branch 2.6.x using TemplateControl (playframework#17)
  Updated with template-control on 2018-05-27T23:54:08.860Z (playframework#16)
  Updated with template-control on 2018-04-06T19:34:58.294Z (playframework#14)
  Updated with template-control on 2018-03-02T18:56:28.624Z (playframework#13)
  Upgrade branch 2.6.x using TemplateControl (playframework#12)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ignasi35 ignasi35 ignasi35 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.
3 participants
@marcospereira @dwijnand @ignasi35