From 73afedc18e9c05b0f84d865313d60f9209f7401b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 12 Aug 2022 18:50:46 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.5.9 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index cf225549..724cb1f0 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ -version = "3.5.8" +version = "3.5.9" project.git = true runner.dialect = "scala213" From e233420d8f4cdd863932d3c1c41deb2da6c1bace Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 12 Aug 2022 18:50:54 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.5.9 Executed command: scalafmt --non-interactive --- src/sbt-test/scoverage/coverage-excluded-files/build.sbt | 2 +- .../coverage-excluded-files/src/main/scala/GoodCoverage.scala | 2 +- src/sbt-test/scoverage/coverage-excluded-packages/build.sbt | 2 +- .../src/main/scala/GoodCoverage.scala | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sbt-test/scoverage/coverage-excluded-files/build.sbt b/src/sbt-test/scoverage/coverage-excluded-files/build.sbt index 510da746..22856a91 100644 --- a/src/sbt-test/scoverage/coverage-excluded-files/build.sbt +++ b/src/sbt-test/scoverage/coverage-excluded-files/build.sbt @@ -5,7 +5,7 @@ scalaVersion := "2.13.6" libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test coverageExcludedFiles := ".*\\/two\\/GoodCoverage" - + resolvers ++= { if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT"))) Seq(Resolver.sonatypeRepo("snapshots")) diff --git a/src/sbt-test/scoverage/coverage-excluded-files/src/main/scala/GoodCoverage.scala b/src/sbt-test/scoverage/coverage-excluded-files/src/main/scala/GoodCoverage.scala index fed56c82..ac6582bb 100644 --- a/src/sbt-test/scoverage/coverage-excluded-files/src/main/scala/GoodCoverage.scala +++ b/src/sbt-test/scoverage/coverage-excluded-files/src/main/scala/GoodCoverage.scala @@ -1,5 +1,5 @@ object GoodCoverage { - + def sum(num1: Int, num2: Int) = { if (0 == num1) num2 else if (0 == num2) num1 else num1 + num2 } diff --git a/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt b/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt index 85ca957d..39d7fecc 100644 --- a/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt +++ b/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt @@ -5,7 +5,7 @@ scalaVersion := "2.13.6" libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test coverageExcludedPackages := "two\\..*" - + resolvers ++= { if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT"))) Seq(Resolver.sonatypeRepo("snapshots")) diff --git a/src/sbt-test/scoverage/coverage-excluded-packages/src/main/scala/GoodCoverage.scala b/src/sbt-test/scoverage/coverage-excluded-packages/src/main/scala/GoodCoverage.scala index fed56c82..ac6582bb 100644 --- a/src/sbt-test/scoverage/coverage-excluded-packages/src/main/scala/GoodCoverage.scala +++ b/src/sbt-test/scoverage/coverage-excluded-packages/src/main/scala/GoodCoverage.scala @@ -1,5 +1,5 @@ object GoodCoverage { - + def sum(num1: Int, num2: Int) = { if (0 == num1) num2 else if (0 == num2) num1 else num1 + num2 } From d4c161b1cf7026e68337bcfc8d9b6533be839c70 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 12 Aug 2022 18:50:54 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.5.9' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index cbc018a2..32fcbed3 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -4,3 +4,6 @@ # # Added scalafmt af2396558918fea00eaa2da12906a3012eb72153 + +# Scala Steward: Reformat with scalafmt 3.5.9 +e233420d8f4cdd863932d3c1c41deb2da6c1bace