Add check for JAVA 9 #3294
Merged
Add check for JAVA 9 #3294
Conversation
This file contains hidden or 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
Currently Gradle cannot work with JAVA 9, so detect if it has been used and break the build for Android. Also the check will print warning when `tns doctor` is called. Also update submodule, where the following change is applied: Fix detection of Javac version The command `javac -version` prints result to stderr when JAVA 8 is used and to stdout when JAVA 9 is used. Current check in CLI uses the stderr output, so when JAVA 9 is installed it fails to detect the correct version. In order to support both JAVA 8 and JAVA 9, capture both stdout and stderr and get the version from there. Also remove unneeded check for Java version - we care about JAVA Compiler, which is included in JDK.
lib/android-tools-info.ts
Outdated
| hasProblemWithJavaVersion = true; | ||
| this.printMessage(`Javac version ${installedJavaVersion} is not supported. You have to install at least ${AndroidToolsInfo.MIN_JAVA_VERSION}.`, additionalMessage); | ||
| } else if (semver.gt(installedJavaCompilerVersion, AndroidToolsInfo.MAX_JAVA_VERSION)) { |
There was a problem hiding this comment.
this should be gte
Mitko-Kerezov
approved these changes
Jan 3, 2018
lib/android-tools-info.ts
Outdated
| if (matchingVersion && matchingVersion[1]) { | ||
| if (semver.lt(matchingVersion[1], AndroidToolsInfo.MIN_JAVA_VERSION)) { | ||
|
|
||
| const matchingVersion = (installedJavacVersion ? appendZeroesToVersion(installedJavacVersion, 3) : "").match(AndroidToolsInfo.VERSION_REGEX); |
There was a problem hiding this comment.
This can be shortened to
const matchingVersion = appendZeroesToVersion(installedJavacVersion || "", 3).match(AndroidToolsInfo.VERSION_REGEX);as appendZeroesToVersion would return an empty string if an empty string is passed as an argument.
test/android-tools-info.ts
Outdated
| const androidToolsInfo = testInjector.resolve<IAndroidToolsInfo>(AndroidToolsInfo); | ||
| assert.deepEqual(androidToolsInfo.validateJavacVersion(javacVersion), expectedResult); | ||
| if (warnings && warnings.length) { | ||
|
|
There was a problem hiding this comment.
We could do without this new line
In some cases javac version is a single number, for example 9. In this case our validation fails to detect the correct version and to check if we support this version. In order to resolve this issue, use the `appendZeroesToVersion` method in order to make the versin semver valid. Change the return type of `validateJavacVersion` method - it does not require to return a Promise. Add unit tests for `validateJavacVersion` method.
rosen-vladimirov
force-pushed
the
vladimirov/java-9
branch
from
2a7f62f to
31bd3a5
Compare
mbektchiev
pushed a commit
that referenced
this pull request
Jan 9, 2018
* Add check for JAVA 9 Currently Gradle cannot work with JAVA 9, so detect if it has been used and break the build for Android. Also the check will print warning when `tns doctor` is called. Also update submodule, where the following change is applied: Fix detection of Javac version The command `javac -version` prints result to stderr when JAVA 8 is used and to stdout when JAVA 9 is used. Current check in CLI uses the stderr output, so when JAVA 9 is installed it fails to detect the correct version. In order to support both JAVA 8 and JAVA 9, capture both stdout and stderr and get the version from there. Also remove unneeded check for Java version - we care about JAVA Compiler, which is included in JDK. * Handle case when Javac version is a single number (9 for example) In some cases javac version is a single number, for example 9. In this case our validation fails to detect the correct version and to check if we support this version. In order to resolve this issue, use the `appendZeroesToVersion` method in order to make the versin semver valid. Change the return type of `validateJavacVersion` method - it does not require to return a Promise. Add unit tests for `validateJavacVersion` method.
rosen-vladimirov
added a commit
that referenced
this pull request
Jan 9, 2018
* minor grammatical update (#3267) * Add check for JAVA 9 (#3294) * Add check for JAVA 9 Currently Gradle cannot work with JAVA 9, so detect if it has been used and break the build for Android. Also the check will print warning when `tns doctor` is called. Also update submodule, where the following change is applied: Fix detection of Javac version The command `javac -version` prints result to stderr when JAVA 8 is used and to stdout when JAVA 9 is used. Current check in CLI uses the stderr output, so when JAVA 9 is installed it fails to detect the correct version. In order to support both JAVA 8 and JAVA 9, capture both stdout and stderr and get the version from there. Also remove unneeded check for Java version - we care about JAVA Compiler, which is included in JDK. * Handle case when Javac version is a single number (9 for example) In some cases javac version is a single number, for example 9. In this case our validation fails to detect the correct version and to check if we support this version. In order to resolve this issue, use the `appendZeroesToVersion` method in order to make the versin semver valid. Change the return type of `validateJavacVersion` method - it does not require to return a Promise. Add unit tests for `validateJavacVersion` method. * release notes 3.4.0 (#3297) * release notes 3.4.0 * add implemented item * remove a fixed issue from changelog * Update submodule to release branch
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.
Currently Gradle cannot work with JAVA 9, so detect if it has been used and break the build for Android. Also the check will print warning when
tns doctoris called.Handle case when Javac version is a single number (9 for example)
In some cases javac version is a single number, for example 9. In this case our validation fails to detect the correct version and to check if we support this version.
In order to resolve this issue, use the
appendZeroesToVersionmethod in order to make the versin semver valid.Change the return type of
validateJavacVersionmethod - it does not require to return a Promise.Add unit tests for
validateJavacVersionmethod.Also update submodule, where the following change is applied:
Fix detection of Javac version
The command
javac -versionprints result to stderr when JAVA 8 is used and to stdout when JAVA 9 is used. Current check in CLI uses the stderr output, so when JAVA 9 is installed it fails to detect the correct version.In order to support both JAVA 8 and JAVA 9, capture both stdout and stderr and get the version from there.
Also remove unneeded check for Java version - we care about JAVA Compiler, which is included in JDK.
Merge after telerik/mobile-cli-lib#1037