Fixes to CLI and version reporting. #2531
Conversation
There was a problem hiding this comment.
Hello, and thank you for opening this PR! 🎉
All contributors have signed the CLA, thank you! ❤️
Commit Messages
We want to keep history, but for that to actually be useful we have
some rules on how to format our commit messages (relevant xkcd).
Please stick to these guidelines for commit messages:
- Separate subject from body with a blank line
- When fixing an issue, start your commit message with
Fix #<ISSUE-NBR>:- Limit the subject line to 72 characters
- Capitalize the subject line
- Do not end the subject line with a period
- Use the imperative mood in the subject line ("Added" instead of "Add")
- Wrap the body at 80 characters
- Use the body to explain what and why vs. how
adapted from https://chris.beams.io/posts/git-commit
Have an awesome day! ☀️
|
@DarkDimius Could you check the compilation failure and run CI again? |
| @@ -135,4 +135,10 @@ trait PropertiesTrait { | |||
| } | |||
| okVersions exists (javaVersion startsWith _) | |||
| } | |||
|
|
|||
| // provide a main method so version info can be obtained by running this | |||
| def main(args: Array[String]): Unit = { | |||
There was a problem hiding this comment.
This commit is called "Remove unnecessary main" but it adds the main back.
There was a problem hiding this comment.
Yes, something got screwed during rebase. Commit messages also got off-by-one, and the implementation of java8 check simply disappeared.
| @@ -115,6 +115,9 @@ object CompilerCommand extends DotClass { | |||
| else if (settings.version.value) { | |||
| ctx.echo(versionMsg) | |||
| Nil | |||
| } else if (!Properties.isJavaAtLeast("1.8")) { | |||
There was a problem hiding this comment.
I don't think dotty is going to work out of the box on Java 9, so we should probably make this an equality check
There was a problem hiding this comment.
@DarkDimius The CI shows this line doesn't work.
|
re-rebased and force-pushed. Checked locally. |
|
LGTM, thanks @DarkDimius ! |
We used to report a hardcoded 0.0.1 version in one place and 2.11 in other places.
Now, we report consistently the version that was used in sbt.
Additionaly, if version countains SNAPSHOT or NIGHTLY it will also report git sha.