-
Notifications
You must be signed in to change notification settings - Fork 1.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Bump scala-cli to 1.4.1 + drop old cli management #21234
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
BTW we'll likely want it backported to 3.5.1 because of VirtusLab/scala-cli#3029 |
4d12fd7
to
7695d9b
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good
else | ||
SCALA_CLI_CMD_BASH=("\"$PROG_HOME/bin/scala-cli\"") | ||
fi | ||
SCALA_CLI_CMD_BASH=("\"$PROG_HOME/bin/scala-cli\"") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder do we really need this cli-common-platform
files anymore. There seems to be exactly 1 usage for each of them
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need to keep these 2 files separated because we have different content depending on what we are building. If we build universal archives (with jars and no native binaries), we will be using https://github.com/scala/scala3/blob/d48ba033d8128e04727dbee88a5a8eb3fa98d26d/dist/bin/cli-common-platform and https://github.com/scala/scala3/blob/main/dist/bin/cli-common-platform.bat. While if we are building archives with native binaries, we will be using https://github.com/scala/scala3/d48ba033d8128e04727dbee88a5a8eb3fa98d26d/main/dist/bin-native-overrides/cli-common-platform and https://github.com/scala/scala3/blob/d48ba033d8128e04727dbee88a5a8eb3fa98d26d/dist/bin-native-overrides/cli-common-platform.bat
I will wait for @bishabosha's review before merging this. unless we have some time constraints for backporting (@WojciechMazur ?) |
There won't be a 3.5.1-RC2 before 3.5.0 is published, so don't worry about the backports |
cc @WojciechMazur @Kordyjan