diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..382cf42 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.7.15 +1daf17e0dd52bb81212bfd226156c3c4855e013c diff --git a/.scalafmt.conf b/.scalafmt.conf index a292681..ec1fe8a 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.7.4" +version = "3.7.15" align.preset = none align.openParenCallSite = false 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,