JDK9 and JDK7 build fixes #2
Merged
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
Progress towards JDK9 akhikhl#390.
Progress towards JDK9 akhikhl#390.
Minimum for Groovy on JDK9 is 2.4.12, ref gradle/gradle#2995 . Progress towards JDK9 akhikhl#390.
Progress towards JDK9 akhikhl#390.
henrik242
approved these changes
Mar 3, 2018
|
@henrik242 my usual preference is for regular merge-commits, not rebase/squash/ff - thoughts? |
|
My preference is definitely to rebase. It gives a clean linear history and the commit log doesn't get cluttered with merge commits. But I'm pragmatic if you disagree :) |
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.
This incorporates the two upstream PRs:
The JDK7 build originally failed due to the non-availability of Oracle JDK7 in Travis Trusty, and OpenJDK7's missing crypto. This hacks its way around that. The JDK7 build is less important but may as well keep it for now and remove it later as required.
JDK9 changes require fixing the internal-package access. Please review that change heavily.
@henrik242 @wolfs @boris-petrov @woldie PTAL if you can and let me know if you can review.