From 0246b8785e74b481dfd22ae30685b7c082a5c0dd Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 24 Jan 2025 20:58:11 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.8.6 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 0c21182..fb1f019 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.3 +version = 3.8.6 align.preset = more runner.dialect = Scala213 maxColumn = 120 From 8c9f28dd69f53fa94bd0226b601eeb0a028a5c4d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 24 Jan 2025 20:58:22 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.8.6 Executed command: scalafmt --non-interactive --- examples/external-docker-network/build.sbt | 4 ++-- examples/simple/build.sbt | 9 +++++---- project/plugins.sbt | 4 ++-- .../docker-compose-env-file-not-found/build.sbt | 3 ++- .../docker-compose-env-manage/build.sbt | 3 ++- .../integration-env-sbt/misconfigured-env/build.sbt | 3 ++- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/examples/external-docker-network/build.sbt b/examples/external-docker-network/build.sbt index 079a8a6..84fef02 100644 --- a/examples/external-docker-network/build.sbt +++ b/examples/external-docker-network/build.sbt @@ -8,5 +8,5 @@ lazy val root = project Some(s"${name.value}-it-network") ), Test / testOptions := integrationEnvTestOpts.value, - Test / fork := true - ) \ No newline at end of file + Test / fork := true + ) diff --git a/examples/simple/build.sbt b/examples/simple/build.sbt index 899ada2..7c15105 100644 --- a/examples/simple/build.sbt +++ b/examples/simple/build.sbt @@ -2,7 +2,8 @@ lazy val root = project .in(file(".")) .enablePlugins(IntegrationEnvPlugin) .settings( - integrationEnvProvider := IntegrationEnv.DockerCompose.Provider("it-env", baseDirectory.value / "docker-compose.yml", None), - Test / testOptions := integrationEnvTestOpts.value, - Test / fork := true - ) \ No newline at end of file + integrationEnvProvider := IntegrationEnv.DockerCompose + .Provider("it-env", baseDirectory.value / "docker-compose.yml", None), + Test / testOptions := integrationEnvTestOpts.value, + Test / fork := true + ) diff --git a/project/plugins.sbt b/project/plugins.sbt index 48dc74d..ef413b5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.24.0") libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value diff --git a/src/sbt-test/integration-env-sbt/docker-compose-env-file-not-found/build.sbt b/src/sbt-test/integration-env-sbt/docker-compose-env-file-not-found/build.sbt index 72aa5ca..a7be383 100644 --- a/src/sbt-test/integration-env-sbt/docker-compose-env-file-not-found/build.sbt +++ b/src/sbt-test/integration-env-sbt/docker-compose-env-file-not-found/build.sbt @@ -2,5 +2,6 @@ lazy val root = project .in(file(".")) .enablePlugins(IntegrationEnvPlugin) .settings( - integrationEnvProvider := IntegrationEnv.DockerCompose.Provider("it-env", baseDirectory.value / "docker-compose.yml", None) + integrationEnvProvider := IntegrationEnv.DockerCompose + .Provider("it-env", baseDirectory.value / "docker-compose.yml", None) ) diff --git a/src/sbt-test/integration-env-sbt/docker-compose-env-manage/build.sbt b/src/sbt-test/integration-env-sbt/docker-compose-env-manage/build.sbt index 72aa5ca..a7be383 100644 --- a/src/sbt-test/integration-env-sbt/docker-compose-env-manage/build.sbt +++ b/src/sbt-test/integration-env-sbt/docker-compose-env-manage/build.sbt @@ -2,5 +2,6 @@ lazy val root = project .in(file(".")) .enablePlugins(IntegrationEnvPlugin) .settings( - integrationEnvProvider := IntegrationEnv.DockerCompose.Provider("it-env", baseDirectory.value / "docker-compose.yml", None) + integrationEnvProvider := IntegrationEnv.DockerCompose + .Provider("it-env", baseDirectory.value / "docker-compose.yml", None) ) diff --git a/src/sbt-test/integration-env-sbt/misconfigured-env/build.sbt b/src/sbt-test/integration-env-sbt/misconfigured-env/build.sbt index 72aa5ca..a7be383 100644 --- a/src/sbt-test/integration-env-sbt/misconfigured-env/build.sbt +++ b/src/sbt-test/integration-env-sbt/misconfigured-env/build.sbt @@ -2,5 +2,6 @@ lazy val root = project .in(file(".")) .enablePlugins(IntegrationEnvPlugin) .settings( - integrationEnvProvider := IntegrationEnv.DockerCompose.Provider("it-env", baseDirectory.value / "docker-compose.yml", None) + integrationEnvProvider := IntegrationEnv.DockerCompose + .Provider("it-env", baseDirectory.value / "docker-compose.yml", None) ) From fd508d4964ac122ede46980cbd6ad7dd88eefb67 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 24 Jan 2025 20:58:23 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.8.6' 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..c8fedd1 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.8.6 +8c9f28dd69f53fa94bd0226b601eeb0a028a5c4d