Backport "Bump scala-cli to 1.4.1 + drop old cli management" to 3.5.1 #21369
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
hamzaremmal
reviewed
Aug 12, 2024
project/Build.scala
Outdated
Comment on lines
2181
to
2191
| Windows / name := "scala", | ||
| Windows / mappings := (Universal / mappings).value, | ||
| Windows / packageBin := (Windows / packageBin).dependsOn(republish).value, | ||
| Windows / wixFiles := (Windows / wixFiles).dependsOn(republish).value, | ||
| // Additional information: https://wixtoolset.org/docs/schema/wxs/package/ | ||
| maintainer := "The Scala Programming Language", // The displayed maintainer of the package | ||
| packageSummary := s"Scala $dottyVersion", // The displayed name of the package | ||
| packageDescription := """Installer for the Scala Programming Language""", // The displayed description of the package | ||
| wixProductId := "*", // Unique ID for each generated MSI; will change for each generated msi | ||
| wixProductUpgradeId := "3E5A1A82-CA67-4353-94FE-5BDD400AF66B", // Unique ID to identify the package; used to manage the upgrades | ||
| wixProductLicense := Some(dist.base / "LICENSE.rtf") // Link to the LICENSE to show during the installation (keep in sync with ../LICENSE) |
There was a problem hiding this comment.
This should not be backported !! We only use the sbt-native-packager starting from 3.6.0
There was a problem hiding this comment.
Correct, thank you. I've reverted these too quick changes done when resolving conflicts.
WojciechMazur
force-pushed
the
backport-3.5.1/21234
branch
from
9fb10cd to
3a60d5c
Compare
hamzaremmal
approved these changes
Aug 12, 2024
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.
Backports #21234 to Scala 3.5.1-RC2