diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..e2999e7 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.8.4 +c5d82121e047306c1b2613f4786ce9ab508a1a98 diff --git a/.scalafmt.conf b/.scalafmt.conf index 0c21182..e42c16f 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.3 +version = 3.8.4 align.preset = more runner.dialect = Scala213 maxColumn = 120 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) )