Skip to content

Commit 2229ea2

Browse files
Update scalafmt-core to 3.9.7 (#150)
* Update scalafmt-core to 3.9.7 * Reformat with scalafmt 3.9.7 Executed command: scalafmt --non-interactive * Add 'Reformat with scalafmt 3.9.7' to .git-blame-ignore-revs
1 parent d568513 commit 2229ea2

File tree

7 files changed

+14
-12
lines changed

7 files changed

+14
-12
lines changed

.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Scala Steward: Reformat with scalafmt 3.9.7
2+
2a79446751fb8fd38d1277d9f5986a7674b4d03f

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "3.9.6"
1+
version = "3.9.7"
22

33
align.preset = more
44
maxColumn = 100

build.mill.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ trait ScalaJsCliModule extends ScalaModule with ScalafixModule {
3838
}
3939

4040
object cli extends Cli
41-
trait Cli extends ScalaJsCliModule with ScalaJsCliPublishModule {
41+
trait Cli extends ScalaJsCliModule with ScalaJsCliPublishModule {
4242
def artifactName: Target[String] = "scalajs" + super.artifactName()
43-
def ivyDeps: Target[Agg[Dep]] = super.ivyDeps() ++ Seq(
43+
def ivyDeps: Target[Agg[Dep]] = super.ivyDeps() ++ Seq(
4444
ivy"org.scala-js::scalajs-linker:${Versions.scalaJsVersion}",
4545
ivy"com.github.scopt::scopt:${Versions.scoptVersion}",
4646
ivy"com.lihaoyi::os-lib:${Versions.osLibVersion}",
@@ -94,7 +94,7 @@ trait Cli extends ScalaJsCliModule with ScalaJsCliPublishModule {
9494
}
9595
}
9696
val loaderContent = coursier.launcher.ClassLoaderContent(entries)
97-
val params = Parameters.Bootstrap(Seq(loaderContent), mainClass0)
97+
val params = Parameters.Bootstrap(Seq(loaderContent), mainClass0)
9898
.withDeterministic(true)
9999
.withPreamble(preamble)
100100

@@ -122,7 +122,7 @@ trait ScalaJsCliNativeImage extends ScalaJsCliModule with NativeImage {
122122
def nativeImageGraalVmJvmId: Target[String] = s"graalvm-java17:$graalVmVersion"
123123
def nativeImageName: Target[String] = "scala-js-ld"
124124
def moduleDeps: Seq[JavaModule] = Seq(cli)
125-
def compileIvyDeps: Target[Agg[Dep]] =
125+
def compileIvyDeps: Target[Agg[Dep]] =
126126
super.compileIvyDeps() ++ Seq(ivy"org.graalvm.nativeimage:svm:$graalVmVersion")
127127
def nativeImageMainClass: Target[String] = "org.scalajs.cli.Scalajsld"
128128

@@ -147,7 +147,7 @@ def native0: native.type = native
147147
def csVersion: String = Versions.coursierVersion
148148

149149
trait ScalaJsCliStaticNativeImage extends ScalaJsCliNativeImage {
150-
def nameSuffix = "-static"
150+
def nameSuffix = "-static"
151151
def buildHelperImage: Target[Unit] = Task {
152152
os.proc("docker", "build", "-t", "scala-cli-base-musl:latest", ".")
153153
.call(cwd = Task.workspace / "musl-image", stdout = os.Inherit)
@@ -171,7 +171,7 @@ trait ScalaJsCliStaticNativeImage extends ScalaJsCliNativeImage {
171171
object `native-static` extends ScalaJsCliStaticNativeImage
172172

173173
trait ScalaJsCliMostlyStaticNativeImage extends ScalaJsCliNativeImage {
174-
def nameSuffix = "-mostly-static"
174+
def nameSuffix = "-mostly-static"
175175
def nativeImageDockerParams: Target[Option[NativeImage.DockerParams]] = Some(
176176
NativeImage.linuxMostlyStaticParams(
177177
s"ubuntu:${Versions.ubuntuVersion}",
@@ -387,7 +387,7 @@ object ci extends Module {
387387
def upload(directory: String = "artifacts/"): Command[Unit] = Task.Command {
388388
val version = finalPublishVersion()
389389

390-
val path = os.Path(directory, Task.workspace)
390+
val path = os.Path(directory, Task.workspace)
391391
val launchers = os.list(path).filter(os.isFile(_)).map { path =>
392392
path -> path.last
393393
}

cli/src/org/scalajs/cli/Scalajsld.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ object Scalajsld {
266266
success
267267

268268
val importMapCheck = c.importMap match {
269-
case None => success
269+
case None => success
270270
case Some(value) =>
271271
if (!value.exists())
272272
failure(s"importmap file at path $value does not exist.")

cli/src/org/scalajs/cli/internal/EsVersionParser.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ object EsVersionParser {
1515
case "es2019" => ESVersion.ES2019
1616
case "es2020" => ESVersion.ES2020
1717
case "es2021" => ESVersion.ES2021
18-
case unknown =>
18+
case unknown =>
1919
throw new IllegalArgumentException(
2020
s"Warning: unrecognized argument: $unknown for --esVersion parameter"
2121
)

cli/src/org/scalajs/cli/internal/ImportMap.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ object ImportMapJsonIr {
2121
}
2222

2323
def remapImports(pathToImportPath: File, irFiles: Seq[IRFile]): Seq[IRFile] = {
24-
val path = os.Path(pathToImportPath)
24+
val path = os.Path(pathToImportPath)
2525
val importMapJson = if (os.exists(path))
2626
readFromString[ImportMap](os.read(path))
2727
else

tests/test/src/org/scalajs/cli/tests/Tests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ class Tests extends munit.FunSuite {
119119
}
120120

121121
test("longRunning") {
122-
val dir = os.temp.dir()
122+
val dir = os.temp.dir()
123123
def writePrintlnMain(stringToPrint: String) =
124124
os.write.over(
125125
dir / "foo.scala",

0 commit comments

Comments
 (0)