[TIMOB-25429] Add JDK 9 detection #127
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
ewanharris
commented
Feb 23, 2018
| @@ -61,7 +61,7 @@ exports.detect = function detect(config, opts, finished) { | |||
| }; | |||
|
|
|||
| function isJDK(dir) { | |||
| if (fs.existsSync(path.join(dir, 'bin', 'javac' + exe)) && fs.existsSync(path.join(dir, 'lib', 'dt.jar'))) { | |||
| if (fs.existsSync(path.join(dir, 'bin', 'javac' + exe))) { | |||
There was a problem hiding this comment.
dt.jar doesn't seem to exist in JDK 9, jdklib uses 'java', 'javac', 'keytool', 'jarsigner' executables in place of this check see here, I think it might be sensible to move to that here too
lib/android.js
Outdated
| result.java.version = m[1]; | ||
| result.java.build = m[2]; | ||
| if (err) { | ||
| next(); |
There was a problem hiding this comment.
Should this be return next() to prevent the next line of code running or second invocation of next()?
There was a problem hiding this comment.
A code review from @muhammaddadu... What year is it? 😄
lib/android.js
Outdated
| } | ||
| var re = /^javac (.+?)(?:_(.+))?$/ | ||
| var m = stderr.trim().match(re) || stdout.trim().match(re);; | ||
| if (m) { |
There was a problem hiding this comment.
Could you do this to make the code flatter?
if (!m) {
return next();
}
|
Well, I'm going to merge this here. I think we need to ask Eric what version of the SDK we can include this. Personally I think it'd make sense to do 7.20 and 7.1.1. |
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.
https://jira.appcelerator.org/browse/TIMOB-25429
Tested across OSX, Windows and Ubuntu.
Attempted to add tests but due to the way that the jdk functionality spawns executables it doesn't seem easy to set up mocking similar to how we test in jdklib, although I might be able to mock out some of the subprocess functions to return the mocks, @cb1kenobi any guidance you might have is appreciated.