Warn if jvm api cannot be used #447
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
tpasternak
force-pushed
the
warn-if-jvm-api-cannot-be-used
branch
2 times, most recently
from
7f9b56d
to
482a670
Compare
If a JVM is requested via `--jvm` command, or via `using java-home` directive, the code is still compiled against Bloop's host jvm. If it's too old, the user should be warned.
tpasternak
force-pushed
the
warn-if-jvm-api-cannot-be-used
branch
from
482a670
to
a5534e9
Compare
tpasternak
force-pushed
the
warn-if-jvm-api-cannot-be-used
branch
from
e67dcbf
to
9f43d15
Compare
| val bloopJvmV = options.javaOptions.bloopJvmVersion | ||
| val javaHome = options.javaHome() | ||
| if (bloopJvmV.exists(javaHome.value.version > _.value)) { | ||
| logger.log(List(scala.build.errors.Diagnostic( |
There was a problem hiding this comment.
NIT
Suggested change
| logger.log(List(scala.build.errors.Diagnostic( | |
| logger.log(List(Diagnostic( |
Comment on lines
216
to
221
| val red = Console.RED | ||
| val yellow = Console.YELLOW | ||
| val reset = Console.RESET | ||
| val prefix = | ||
| if (severity == Severity.Error) s"[${red}error$reset] " | ||
| else s"[${yellow}warn$reset] " |
There was a problem hiding this comment.
NIT Factor those as private fields in object ConsoleBloopBuildClient?
| if (severity == Severity.Error) s"[${red}error$reset] " | ||
| else s"[${yellow}warn$reset] " | ||
| val msgIt = message.linesIterator | ||
| out.println(s"${prefix}bloop:" + (if (msgIt.hasNext) " " + msgIt.next() else "")) |
There was a problem hiding this comment.
Why a "bloop" here?
| for (line <- msgIt) | ||
| out.println(prefix + line) | ||
|
|
||
| for { pos <- positions } pos match { |
There was a problem hiding this comment.
NIT Syntax
Suggested change
| for { pos <- positions } pos match { | |
| positions.foreach { |
| scalaOptions = ScalaOptions(scalacOptions = scalacOptions) | ||
| ) | ||
|
|
||
| val inputs = new Inputs(Nil, None, os.pwd, "project", false) |
There was a problem hiding this comment.
NIT
Suggested change
| val inputs = new Inputs(Nil, None, os.pwd, "project", false) | |
| val inputs = Inputs(Nil, None, os.pwd, "project", false) |
| (scalaCompilerOptions, res.right.get.javacOptions, logger.diagnostics) | ||
| } | ||
|
|
||
| def jvm(v: Int) = os.proc("cs", "java-home", "--jvm", s"zulu:$v").call().out.text().trim() |
There was a problem hiding this comment.
Ideally, we should use the same value as in the ITs (just "cs" is a problem when the launcher is cs.bat on Windows, but not when it's cs.exe, IIRC).
modules/build/src/main/scala/scala/build/ConsoleBloopBuildClient.scala
Outdated
Show resolved
Hide resolved
modules/build/src/test/scala/scala/build/tests/BuildProjectTests.scala
Outdated
Show resolved
Hide resolved
modules/build/src/test/scala/scala/build/tests/BuildProjectTests.scala
Outdated
Show resolved
Hide resolved
Co-authored-by: Alexandre Archambault <alexarchambault@users.noreply.github.com>
alexarchambault
approved these changes
Dec 9, 2021
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.
No description provided.