From 8ea266d44f5881c28219538d53ac3ae3b835f477 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 7 Jun 2025 21:28:52 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.9.7 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index ec8f58e..6f84a99 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.9.6" +version = "3.9.7" align.preset = more maxColumn = 100 From 2a79446751fb8fd38d1277d9f5986a7674b4d03f Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 7 Jun 2025 21:28:58 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.9.7 Executed command: scalafmt --non-interactive --- build.mill.scala | 14 +++++++------- cli/src/org/scalajs/cli/Scalajsld.scala | 2 +- .../org/scalajs/cli/internal/EsVersionParser.scala | 2 +- cli/src/org/scalajs/cli/internal/ImportMap.scala | 2 +- tests/test/src/org/scalajs/cli/tests/Tests.scala | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.mill.scala b/build.mill.scala index c2d08b3..c44c57c 100644 --- a/build.mill.scala +++ b/build.mill.scala @@ -38,9 +38,9 @@ trait ScalaJsCliModule extends ScalaModule with ScalafixModule { } object cli extends Cli -trait Cli extends ScalaJsCliModule with ScalaJsCliPublishModule { +trait Cli extends ScalaJsCliModule with ScalaJsCliPublishModule { def artifactName: Target[String] = "scalajs" + super.artifactName() - def ivyDeps: Target[Agg[Dep]] = super.ivyDeps() ++ Seq( + def ivyDeps: Target[Agg[Dep]] = super.ivyDeps() ++ Seq( ivy"org.scala-js::scalajs-linker:${Versions.scalaJsVersion}", ivy"com.github.scopt::scopt:${Versions.scoptVersion}", ivy"com.lihaoyi::os-lib:${Versions.osLibVersion}", @@ -94,7 +94,7 @@ trait Cli extends ScalaJsCliModule with ScalaJsCliPublishModule { } } val loaderContent = coursier.launcher.ClassLoaderContent(entries) - val params = Parameters.Bootstrap(Seq(loaderContent), mainClass0) + val params = Parameters.Bootstrap(Seq(loaderContent), mainClass0) .withDeterministic(true) .withPreamble(preamble) @@ -122,7 +122,7 @@ trait ScalaJsCliNativeImage extends ScalaJsCliModule with NativeImage { def nativeImageGraalVmJvmId: Target[String] = s"graalvm-java17:$graalVmVersion" def nativeImageName: Target[String] = "scala-js-ld" def moduleDeps: Seq[JavaModule] = Seq(cli) - def compileIvyDeps: Target[Agg[Dep]] = + def compileIvyDeps: Target[Agg[Dep]] = super.compileIvyDeps() ++ Seq(ivy"org.graalvm.nativeimage:svm:$graalVmVersion") def nativeImageMainClass: Target[String] = "org.scalajs.cli.Scalajsld" @@ -147,7 +147,7 @@ def native0: native.type = native def csVersion: String = Versions.coursierVersion trait ScalaJsCliStaticNativeImage extends ScalaJsCliNativeImage { - def nameSuffix = "-static" + def nameSuffix = "-static" def buildHelperImage: Target[Unit] = Task { os.proc("docker", "build", "-t", "scala-cli-base-musl:latest", ".") .call(cwd = Task.workspace / "musl-image", stdout = os.Inherit) @@ -171,7 +171,7 @@ trait ScalaJsCliStaticNativeImage extends ScalaJsCliNativeImage { object `native-static` extends ScalaJsCliStaticNativeImage trait ScalaJsCliMostlyStaticNativeImage extends ScalaJsCliNativeImage { - def nameSuffix = "-mostly-static" + def nameSuffix = "-mostly-static" def nativeImageDockerParams: Target[Option[NativeImage.DockerParams]] = Some( NativeImage.linuxMostlyStaticParams( s"ubuntu:${Versions.ubuntuVersion}", @@ -387,7 +387,7 @@ object ci extends Module { def upload(directory: String = "artifacts/"): Command[Unit] = Task.Command { val version = finalPublishVersion() - val path = os.Path(directory, Task.workspace) + val path = os.Path(directory, Task.workspace) val launchers = os.list(path).filter(os.isFile(_)).map { path => path -> path.last } diff --git a/cli/src/org/scalajs/cli/Scalajsld.scala b/cli/src/org/scalajs/cli/Scalajsld.scala index 28ae4f8..c615bf0 100644 --- a/cli/src/org/scalajs/cli/Scalajsld.scala +++ b/cli/src/org/scalajs/cli/Scalajsld.scala @@ -266,7 +266,7 @@ object Scalajsld { success val importMapCheck = c.importMap match { - case None => success + case None => success case Some(value) => if (!value.exists()) failure(s"importmap file at path $value does not exist.") diff --git a/cli/src/org/scalajs/cli/internal/EsVersionParser.scala b/cli/src/org/scalajs/cli/internal/EsVersionParser.scala index b8f9c95..c7fa369 100644 --- a/cli/src/org/scalajs/cli/internal/EsVersionParser.scala +++ b/cli/src/org/scalajs/cli/internal/EsVersionParser.scala @@ -15,7 +15,7 @@ object EsVersionParser { case "es2019" => ESVersion.ES2019 case "es2020" => ESVersion.ES2020 case "es2021" => ESVersion.ES2021 - case unknown => + case unknown => throw new IllegalArgumentException( s"Warning: unrecognized argument: $unknown for --esVersion parameter" ) diff --git a/cli/src/org/scalajs/cli/internal/ImportMap.scala b/cli/src/org/scalajs/cli/internal/ImportMap.scala index 7a6e111..b003cbe 100644 --- a/cli/src/org/scalajs/cli/internal/ImportMap.scala +++ b/cli/src/org/scalajs/cli/internal/ImportMap.scala @@ -21,7 +21,7 @@ object ImportMapJsonIr { } def remapImports(pathToImportPath: File, irFiles: Seq[IRFile]): Seq[IRFile] = { - val path = os.Path(pathToImportPath) + val path = os.Path(pathToImportPath) val importMapJson = if (os.exists(path)) readFromString[ImportMap](os.read(path)) else diff --git a/tests/test/src/org/scalajs/cli/tests/Tests.scala b/tests/test/src/org/scalajs/cli/tests/Tests.scala index dc853ec..a268601 100644 --- a/tests/test/src/org/scalajs/cli/tests/Tests.scala +++ b/tests/test/src/org/scalajs/cli/tests/Tests.scala @@ -119,7 +119,7 @@ class Tests extends munit.FunSuite { } test("longRunning") { - val dir = os.temp.dir() + val dir = os.temp.dir() def writePrintlnMain(stringToPrint: String) = os.write.over( dir / "foo.scala", From 4bcdeb7c18b16a7ec003d60b864777ce3ae9d0a2 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 7 Jun 2025 21:28:58 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.9.7' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..3f98c27 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.9.7 +2a79446751fb8fd38d1277d9f5986a7674b4d03f