From d96d0aa23d6daf3ddd13d52075ce8f278d41ead3 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 17 Nov 2023 20:18:30 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.7.17 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index a292681..b761d01 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.7.4" +version = "3.7.17" align.preset = none align.openParenCallSite = false From 1b4b60efd4b4c50466f0a11d50532656491e178b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 17 Nov 2023 20:18:43 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.7.17 Executed command: scalafmt --non-interactive --- main/src/de/tobiasroeser/mill/vaadin/VaadinModule.scala | 4 +++- .../mill/vaadin/worker/impl/VaadinToolsWorkerImpl.scala | 4 +--- .../de/tobiasroeser/mill/vaadin/worker/MillVaadinConfig.scala | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/main/src/de/tobiasroeser/mill/vaadin/VaadinModule.scala b/main/src/de/tobiasroeser/mill/vaadin/VaadinModule.scala index 26c69bc..c6d595d 100644 --- a/main/src/de/tobiasroeser/mill/vaadin/VaadinModule.scala +++ b/main/src/de/tobiasroeser/mill/vaadin/VaadinModule.scala @@ -39,7 +39,9 @@ trait VaadinModule extends VaadinModulePlatform { def millVaadinConfig(prodMode: Task[Boolean]): Task[MillVaadinConfig] = T.task { val frontend = vaadinFrontend().path val res = resources().map(_.path) - if (res.size != 1) { T.log.error(s"Not exactly one resource location defined. Using just the first: ${res.headOption.getOrElse("")}") } + if (res.size != 1) { + T.log.error(s"Not exactly one resource location defined. Using just the first: ${res.headOption.getOrElse("")}") + } val dest = vaadinBuildPath().path val config = new MillVaadinConfig { override val compatTargetDir: Path = dest diff --git a/main/worker/impl/src/de/tobiasroeser/mill/vaadin/worker/impl/VaadinToolsWorkerImpl.scala b/main/worker/impl/src/de/tobiasroeser/mill/vaadin/worker/impl/VaadinToolsWorkerImpl.scala index 5288a51..78c44cc 100644 --- a/main/worker/impl/src/de/tobiasroeser/mill/vaadin/worker/impl/VaadinToolsWorkerImpl.scala +++ b/main/worker/impl/src/de/tobiasroeser/mill/vaadin/worker/impl/VaadinToolsWorkerImpl.scala @@ -23,8 +23,6 @@ class VaadinToolsWorkerImpl() extends VaadinToolsWorker { BuildFrontendUtil.runFrontendBuild(adapter) } - def cleanFrontend(config: MillVaadinConfig)(implicit ctx: Ctx): Unit = { - - } + def cleanFrontend(config: MillVaadinConfig)(implicit ctx: Ctx): Unit = {} } diff --git a/main/worker/src/de/tobiasroeser/mill/vaadin/worker/MillVaadinConfig.scala b/main/worker/src/de/tobiasroeser/mill/vaadin/worker/MillVaadinConfig.scala index 5fd04bc..f51a9bf 100644 --- a/main/worker/src/de/tobiasroeser/mill/vaadin/worker/MillVaadinConfig.scala +++ b/main/worker/src/de/tobiasroeser/mill/vaadin/worker/MillVaadinConfig.scala @@ -42,7 +42,7 @@ trait MillVaadinConfig { "resourceOutputPath" -> resourceOutputPath, "resourcePath" -> resourcePath, "vaadinBuildOutputPath" -> vaadinBuildOutputPath, - "webpackOutPath" -> webpackOutPath, + "webpackOutPath" -> webpackOutPath ).mkString( s"""${getClass.getSimpleName}( | """.stripMargin, From cc073d951088046d04e042b15602fe164e5bfd0b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 17 Nov 2023 20:18:43 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.7.17' 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..2b73777 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.7.17 +1b4b60efd4b4c50466f0a11d50532656491e178b