TemplateImports cleanup #8403
Merged
TemplateImports cleanup #8403
Conversation
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
PromanSEW
reviewed
May 10, 2018
| @@ -25,7 +25,7 @@ | |||
| )); | |||
|
|
|||
| static { | |||
| List<String> minimalJavaImports = new ArrayList(); | |||
| List<String> minimalJavaImports = new ArrayList<String>(); | |||
There was a problem hiding this comment.
You can use diamond operator here because it is Java 7+ code
There was a problem hiding this comment.
I don't think the build-link project is. Here's what I get if I try:
[error] playframework/framework/src/build-link/src/main/java/play/TemplateImports.java:28: diamond operator is not supported in -source 1.6
[error] (use -source 7 or higher to enable diamond operator)
[error] List<String> minimalJavaImports = new ArrayList<>();
|
Thank you, @benmccann. Just our curiosity, in what part of Gradle integration are you currently working? Best. |
|
Just rebasing some old PRs I opened a long time ago |
richdougherty
pushed a commit
to richdougherty/playframework
that referenced
this pull request
May 16, 2018
|
Backport here: #8414. |
richdougherty
pushed a commit
to richdougherty/playframework
that referenced
this pull request
May 17, 2018
richdougherty
added a commit
that referenced
this pull request
May 18, 2018
* Documentation test task depending on publishLocal for play-docs (#8353) We cannot have `apiURL` scoped since later sbt reads the setting without a scope. So the change introduced in #8317 had no effect on the generated pom file. We then need to "unscope" apiURL and run `publishLocal` for play-docs before running `test` for documentation. * Add play-rconf on module directory (#8388) Signed-off-by: Thibault Meyer <meyer.thibault@gmail.com> * Upgrade netty (#8389) * use foldLeft instead of /: (#8394) https://github.com/scala/scala/blob/312ddb5d1e3436d7e07acad978cb116e9d023164/src/library/scala/collection/IterableOnce.scala#L465 * Update documentation about SBT usage (#8395) * Use Guice to initialize database connection pools (#8410) Fixes #8402. We now pass the Injector value to the initialization code so that it can use Guice to load a value instead of always using the default constructor. Increases visibility of PooledDatabase.pool field so that we can unit test its value more easily. * Link to Markdown plugin directs to 404 page (#8409) Markdown Support plugin now links to IntelliJ IDEA Markdown help page * TemplateImports cleanup (#8403)
richdougherty
pushed a commit
that referenced
this pull request
May 18, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I noticed a couple minor code issues while working on the Gradle integration