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.

Sign up for GitHub

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

Jump to bottom

Update scalafmt-core to 3.8.2 #393

Closed
wants to merge 3 commits into from
Closed

Update scalafmt-core to 3.8.2 #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df5b421
Update scalafmt-core to 3.8.2
scala-steward Jun 16, 2024
6c4324c
Reformat with scalafmt 3.8.2
scala-steward Jun 16, 2024
3881052
Add 'Reformat with scalafmt 3.8.2' to .git-blame-ignore-revs
scala-steward Jun 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.8.2
6c4324ce8dd8c23e100c4c6d26c9834af083f421
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.7.17"
version = "3.8.2"

align.preset = more
maxColumn = 100
Expand Down
7 changes: 4 additions & 3 deletions modules/almond-spark/src/main/scala/org/apache/spark/sql/almondinternals/StageElem.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,10 @@ final class StageElem(

publish.updateHtml(
s"""<div class="progress">
| <div class="progress-bar" role="progressbar" style="background-color: blue; width: $donePct%; ${extraStyle.mkString(
"; "
)}; color: white" aria-valuenow="$donePct" aria-valuemin="0" aria-valuemax="100">
| <div class="progress-bar" role="progressbar" style="background-color: blue; width: $donePct%; ${extraStyle
.mkString(
"; "
)}; color: white" aria-valuenow="$donePct" aria-valuemin="0" aria-valuemax="100">
| $doneTasks0${if (diff == 0) "" else s" + $diff"} / $numTasks
| </div>
| <div class="progress-bar" role="progressbar" style="background-color: red; width: $startedPct%" aria-valuenow="$startedPct" aria-valuemin="0" aria-valuemax="100"></div>
Expand Down
10 changes: 6 additions & 4 deletions modules/tests/src/main/scala/ammonite/spark/Init.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ object Init {

@ assert(org.apache.spark.SPARK_VERSION == "$sparkVersion") // sanity check

@ val spark = AmmoniteSparkSession.builder()${prependBuilderCalls.mkString}.appName("test-ammonite-spark").master("$master")${conf.map(
t => s".config($q${t._1}$q, $q${t._2}$q)"
@ val spark = AmmoniteSparkSession.builder()${prependBuilderCalls
.mkString}.appName("test-ammonite-spark").master("$master")${conf.map(t =>
s".config($q${t._1}$q, $q${t._2}$q)"
).mkString}.getOrCreate()

@ def sc = spark.sparkContext"""
Expand All @@ -56,8 +57,9 @@ object Init {
|
|assert(org.apache.spark.SPARK_VERSION == "$sparkVersion") // sanity check
|
|val spark = AmmoniteSparkSession.builder()${prependBuilderCalls.mkString}.appName("test-ammonite-spark").master("$master")${conf.map(
t => s".config($q${t._1}$q, $q${t._2}$q)"
|val spark = AmmoniteSparkSession.builder()${prependBuilderCalls
.mkString}.appName("test-ammonite-spark").master("$master")${conf.map(t =>
s".config($q${t._1}$q, $q${t._2}$q)"
).mkString}.getOrCreate()
|def sc = spark.sparkContext
|""".stripMargin
Expand Down