Update minimum gradle version and remove assumption around target compatibility #18595
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
|
@rjernst can you have a look please? This is working in my branch but I may have missed something :) |
javanna
changed the title
| options.forkOptions.memoryMaximumSize = "1g" | ||
| if (targetCompatibility == '1.8' || targetCompatibility == '1.9') { | ||
| options.fork = true | ||
| options.forkOptions.executable = new File(project.javaHome, 'bin/javac') |
There was a problem hiding this comment.
I assume we will be using java 8 to compile java 7? In that case, i don't see why we need to conditionalize any of the fork options. It seems like it should only be the compact profile arg that is conditionalized below?
There was a problem hiding this comment.
you are right, I pushed a new commit to fix that
javanna
force-pushed
the
enhancement/gradle_2.13
branch
from
e008dfd
to
7979cb6
Compare
| @@ -372,18 +372,20 @@ class BuildPlugin implements Plugin<Project> { | |||
| options.fork = true | |||
| options.forkOptions.executable = new File(project.javaHome, 'bin/javac') | |||
| options.forkOptions.memoryMaximumSize = "1g" | |||
| if (targetCompatibility == '1.8' || targetCompatibility == '1.9') { | |||
There was a problem hiding this comment.
We actually set targetCompatibility to a value from gradle's JavaVersion enum. So this comparison can be something like:
if (targetCompatibility >= JavaVersion.VERSION_1_8) {
There was a problem hiding this comment.
perfect, I was not sure about that, thanks for bringing that up
|
LGTM, I left one more minor request. |
javanna
force-pushed
the
enhancement/gradle_2.13
branch
2 times, most recently
from
f07b98a
to
28663b3
Compare
It came out with improvements around idea integration and language levels. This will make it possible to have the upcoming java client as a new project compiled against java 7 and have idea working on the right language level.
This change makes it possible to compile a separate project with e.g. targetCompatibility 1.7. Adds specific options (compact profile) only when compiling for >= 1.8.
javanna
force-pushed
the
enhancement/gradle_2.13
branch
from
28663b3
to
0e563b3
Compare
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.
Up until now we assumed that we always compile with java 8 or java 9 and never with targetCompatibility lower than 1.8. This will be necessary with the upcoming java http client as it will be 1.7 compatible. We should then apply specific options only when using 1.8 or 1.9.
Also by upgrading the minimum required gradle version to 2.13 we better support subprojects that need to compile against different target versions as there were previously issues with the intellij integration around that.