Skip to content
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

Fix proposed version syntax #3555

Merged
merged 2 commits into from
Jun 6, 2023
Merged

Fix proposed version syntax #3555

merged 2 commits into from
Jun 6, 2023

Conversation

JD557
Copy link
Contributor

@JD557 JD557 commented Jun 6, 2023

Follow up to #3544, the proposed version string looks something like:
version = '3.7.4'

While scalafmt only accepts strings formatted like:
version = 3.7.4

Curiously enough, the original issue (#3543) had it right 😅

@@ -96,7 +96,7 @@ object Cli {
"true" == System.getProperty("scalafmt.native-image", "false")

private def getProposedConfigVersion(options: CliOptions): String =
s"version = '$stableVersion'"
s"version = $stableVersion"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you make the same change on line 137 below (where it was copied from)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, thanks for the heads up 👍

@kitbellew kitbellew merged commit 2292e10 into scalameta:master Jun 6, 2023
srowen pushed a commit to apache/spark that referenced this pull request Jun 30, 2023
…ersion

### What changes were proposed in this pull request?
The pr aims to update some maven plugins & scalafmt to newest version, include:
- maven-clean-plugin from 3.2.0 to 3.3.1
- maven-shade-plugin from 3.4.1 to 3.5.0
- scalafmt from 3.7.4 to 3.7.5

### Why are the changes needed?
1.maven-clean-plugin
https://github.com/apache/maven-clean-plugin/releases/tag/maven-clean-plugin-3.3.1

2.maven-shade-plugin
https://github.com/apache/maven-shade-plugin/releases/tag/maven-shade-plugin-3.5.0

3.scalafmt
https://github.com/scalameta/scalafmt/releases/tag/v3.7.5
Router: make sure to indent comments after lambda (scalameta/scalafmt#3556) kitbellew
Fix proposed version syntax (scalameta/scalafmt#3555) JD557

### Does this PR introduce _any_ user-facing change?
No.

### How was this patch tested?
Pass GA.

Closes #41803 from panbingkun/SPARK-44257.

Authored-by: panbingkun <[email protected]>
Signed-off-by: Sean Owen <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants