Upgrade branch 2.7.x using TemplateControl#82
Upgrade branch 2.7.x using TemplateControl#82mergify[bot] merged 18 commits intoplayframework:2.7.xfrom
Conversation
octonato
commented
Nov 16, 2018
octonato
commented
**/plugins.sbt:
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.0-RC3")
**/plugins.sbt:
addSbtPlugin("com.typesafe.sbt" % "sbt-play-ebean" % "5.0.0-RC1")
|
Needs playframework/playframework#8827 coming in |
ignasi35
changed the title
ignasi35
changed the title
Co-Authored-By: renatocaval <renato@cavalcanti.be>
| <h1 id="homeTitle">@Messages("computers.list.title", currentPage.getTotalCount)</h1> | ||
|
|
||
| @if(flash.containsKey("success")) { | ||
| @request.flash.asScala().get("success").map { successFlashValue => |
There was a problem hiding this comment.
If there is an implicit Http.Request then you can use @flash("key") (also returns a Optional).
There was a problem hiding this comment.
Then I need to review a few other samples.
build.sbt
Outdated
| libraryDependencies += "org.mockito" % "mockito-core" % "2.1.0" % Test | ||
| testOptions in Test += Tests.Argument(TestFrameworks.JUnit, "-a", "-v") | ||
|
|
||
| javacOptions ++= Seq( |
There was a problem hiding this comment.
Oh, SGTM. We'll need to adapt other samples too.
scripts/script-helper
Outdated
| if [[ $java_version = 1.8* ]] ; then | ||
| echo "The build is using Java 8 ($java_version). No addional JVM params needed." | ||
| else | ||
| echo "The build is using Java 9+ ($java_version). We need additional JVM parameters" |
There was a problem hiding this comment.
Since we are not testing against Java 9 anymore, we can completely remove this file.
.travis.yml
Outdated
| env: | ||
| matrix: | ||
| - SCRIPT=scripts/test-sbt | ||
| # - SCRIPT=scripts/test-gradle |
There was a problem hiding this comment.
Keep this running since it is allowed to fail.
There was a problem hiding this comment.
The scripts/test-gradle doesn't exist. It's a different type of failure but I guess we can live with that and have identical .travis.yml in exchange. 👍
There was a problem hiding this comment.
Oh... this is the Ebean sample.
Now I remember that it does not work on Gradle because the project depends on play-enhancer. So, yeah we can keep Gradle out here.
There was a problem hiding this comment.
so, should we merge this or not?
octonato
added
status:merge-when-green
type:template-control
and removed
status:block-merge
labels
app/views/list.scala.html
Outdated
| <h1 id="homeTitle">@Messages("computers.list.title", currentPage.getTotalCount)</h1> | ||
|
|
||
| @if(flash.containsKey("success")) { | ||
| @flash("success").map { successFlashValue => |
There was a problem hiding this comment.
This is breaking the build, and reveals a glitch in the current APIs:
4 participants
