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 2.8.0-M1 #16

Merged
merged 4 commits into from
May 28, 2019
Merged

Use 2.8.0-M1 #16

merged 4 commits into from
May 28, 2019

Conversation

ignasi35
Copy link
Member

@ignasi35 ignasi35 commented May 27, 2019 •
edited
Loading

(edit: this PR now targets 2.8.x) This PR will need editing so the target is 2.8.x (not 2.7.x as it is now). I just want travis to work for me.

@ignasi35 ignasi35 marked this pull request as ready for review May 27, 2019 14:27
@ignasi35 ignasi35 closed this May 27, 2019
@ignasi35 ignasi35 reopened this May 27, 2019
@dwijnand dwijnand mentioned this pull request May 27, 2019
Closed
20 tasks
@ignasi35 ignasi35 changed the base branch from 2.7.x to 2.8.x May 28, 2019 11:44
@ignasi35 ignasi35 mentioned this pull request May 28, 2019
Merged
@ignasi35 ignasi35 changed the title [WIP] Use 2.8.0-M1 Use 2.8.0-M1 May 28, 2019
octonato
octonato approved these changes May 28, 2019
View reviewed changes
Copy link
Contributor

@octonato octonato left a comment

Choose a reason for hiding this comment

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

I see that there are some code changes. One more reason to do it earlier then later. 👍

Btw, template control is capable to update the samples, we only need to configure it for 2.8.x as well. Something to consider next time.

ignasi35
ignasi35 commented May 28, 2019
View reviewed changes
play-java-dagger2-example/project/plugins.sbt
@@ -1,2 +1,2 @@
// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.2")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.0-M1")
Copy link
Member Author

Choose a reason for hiding this comment

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

$ fastmod '"com.typesafe.play" % "sbt-plugin" % "2.7.2"' '"com.typesafe.play" % "sbt-plugin" % "2.8.0-M1"'

@ignasi35
Copy link
Member Author

Btw, template control is capable to update the samples, we only need to configure it for 2.8.x as well. Something to consider next time.

There is a rather large number of changes handled by templatecontrol which can more simply be handled by fastmod.

@octonato
Copy link
Contributor

There is a rather large number of changes handled by templatecontrol which can more simply be handled by fastmod.

Maybe, since we have one single repo now, we can retire templatecontrol. It was useful to apply changes over many different repos and branches.

@ignasi35 ignasi35 merged commit 3df2de9 into playframework:2.8.x May 28, 2019
@marcospereira
Copy link
Member

marcospereira commented May 29, 2019 •
edited
Loading

I see that there are some code changes. One more reason to do it earlier then later. 👍

Yeah, and we didn't notice this before because not all Java samples have these javacOptions:

play-samples/play-java-starter-example/build.sbt

Lines 9 to 15 in ec17d62

javacOptions ++= Seq(
"-encoding", "UTF-8",
"-parameters",
"-Xlint:unchecked",
"-Xlint:deprecation",
"-Werror"
)

@dwijnand
Copy link
Member

Well, now that they're all in one repo we can make it and keep it uniform.

dwijnand added a commit that referenced this pull request Jun 3, 2019
@dwijnand
Merge remote-tracking branch 'play-java-hello-world-tutorial/2.6.x' i…
7b21cb4 
…nto 2.6.x

* play-java-hello-world-tutorial/2.6.x: (25 commits)
  Nest play-java-hello-world-tutorial
  Updated with template-control on 2019-02-13T20:25:39.692Z (#24)
  Updated with template-control on 2019-02-01T10:40:33.398Z   /.mergify.yml:     wrote /.mergify.yml
  add new travis build
  Updated with template-control on 2019-01-18T14:59:32.531Z   /LICENSE:     wrote /LICENSE   /NOTICE:     wrote /NOTICE   /.mergify.yml:     wrote /.mergify.yml   **build.sbt:     scalaVersion := "2.12.8"   **/build.properties:     sbt.version=1.2.8   **/plugins.sbt:     addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")   **build.gradle:     def playVersion = "2.6.21"
  adds gradle build definition (#18)
  Clarifying that if user downloaded from Tech Hub, it includes sbt dist
  Add travis build configuration (#16)
  Make the tutorial project more close to the other samples (#15)
  Add syntax hightlight to code samples (#13)
  Fix unclosed tags (#12)
  Small fixes (#11)
  Example app java (#10)
  Fixes some error in Scala example code (#9)
  fixed awkward sentence
  Misc fixes (#8)
  Some more tweaks (#7)
  Update Hello-Scala.md
  Minor updates (#6)
  Adding a Scala version for review (#5)
  ...
dwijnand added a commit that referenced this pull request Jun 3, 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 (#39)
  Upgrade branch 2.6.x using TemplateControl (#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 (#33)
  Updated with template-control on 2019-01-04T17:13:24.081Z (#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 (#23)
  set log4j2.xml as javaOptions (#20)
  Updated with template-control on 2018-08-20T20:37:13.971Z (#22)
  Updated with template-control on 2018-07-19T01:58:55.708Z (#19)
  Updated with template-control on 2018-07-16T18:38:45.739Z (#18)
  Upgrade branch 2.6.x using TemplateControl (#17)
  Updated with template-control on 2018-05-27T23:54:08.860Z (#16)
  Updated with template-control on 2018-04-06T19:34:58.294Z (#14)
  Updated with template-control on 2018-03-02T18:56:28.624Z (#13)
  Upgrade branch 2.6.x using TemplateControl (#12)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@octonato octonato octonato 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
4 participants
@ignasi35 @octonato @marcospereira @dwijnand