Skip to content

Update scalafmt-core to 3.9.7 #150

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

Merged
merged 3 commits into from
Jun 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.9.7
2a79446751fb8fd38d1277d9f5986a7674b4d03f
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.9.6"
version = "3.9.7"

align.preset = more
maxColumn = 100
Expand Down
14 changes: 7 additions & 7 deletions build.mill.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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}",
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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"

Expand All @@ -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)
Expand All @@ -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}",
Expand Down Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion cli/src/org/scalajs/cli/Scalajsld.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand Down
2 changes: 1 addition & 1 deletion cli/src/org/scalajs/cli/internal/EsVersionParser.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/src/org/scalajs/cli/internal/ImportMap.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/test/src/org/scalajs/cli/tests/Tests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down