From 369559e54068770877d2d28fa2dbf7497513d81e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 19 Aug 2021 05:58:26 +0200 Subject: [PATCH 1/2] Update scalafmt-core to 3.0.0 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 010fa6d5..334e29d7 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1 +1 @@ -version = "2.7.5" +version = "3.0.0" From cf2dcaca88019354617c3594c72ed8e0e1fce9a8 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 19 Aug 2021 05:58:34 +0200 Subject: [PATCH 2/2] Reformat with scalafmt 3.0.0 --- .../scala/org/scoverage/issue53/part/a/AdderScala.scala | 5 ++--- .../org/scoverage/issue53/part/b/SubtractorScala.scala | 6 ++---- src/sbt-test/scoverage/aggregate-only/project/plugins.sbt | 4 +++- .../scala/org/scoverage/issue53/part/a/AdderScala.scala | 5 ++--- .../org/scoverage/issue53/part/b/SubtractorScala.scala | 6 ++---- src/sbt-test/scoverage/aggregate/project/plugins.sbt | 4 +++- src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt | 7 ++++++- .../scoverage/bad-coverage-file-branch/project/plugins.sbt | 4 +++- src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt | 7 ++++++- .../scoverage/bad-coverage-file-stmt/project/plugins.sbt | 4 +++- .../scoverage/bad-coverage-package-branch/build.sbt | 7 ++++++- .../bad-coverage-package-branch/project/plugins.sbt | 4 +++- src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt | 7 ++++++- .../bad-coverage-package-stmt/project/plugins.sbt | 4 +++- src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt | 7 ++++++- .../bad-coverage-total-branch/project/plugins.sbt | 4 +++- src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt | 7 ++++++- .../scoverage/bad-coverage-total-stmt/project/plugins.sbt | 4 +++- src/sbt-test/scoverage/bad-coverage/project/plugins.sbt | 4 +++- .../bad-coverage/src/main/scala/BadCoverage.scala | 2 +- src/sbt-test/scoverage/coverage-off/project/plugins.sbt | 4 +++- src/sbt-test/scoverage/good-coverage/project/plugins.sbt | 4 +++- src/sbt-test/scoverage/preserve-set/project/plugins.sbt | 4 +++- .../scoverage/scalac-plugin-version/project/plugins.sbt | 4 +++- src/sbt-test/scoverage/scalajs/project/plugins.sbt | 4 +++- .../scalajs/sjstest/shared/src/main/scala/UnderTest.scala | 1 - 26 files changed, 87 insertions(+), 36 deletions(-) diff --git a/src/sbt-test/scoverage/aggregate-only/partA/src/main/scala/org/scoverage/issue53/part/a/AdderScala.scala b/src/sbt-test/scoverage/aggregate-only/partA/src/main/scala/org/scoverage/issue53/part/a/AdderScala.scala index 30415c1d..96b580e3 100644 --- a/src/sbt-test/scoverage/aggregate-only/partA/src/main/scala/org/scoverage/issue53/part/a/AdderScala.scala +++ b/src/sbt-test/scoverage/aggregate-only/partA/src/main/scala/org/scoverage/issue53/part/a/AdderScala.scala @@ -1,8 +1,7 @@ package org.scoverage.issue53.part.a -/** - * Created by Mikhail Kokho on 7/10/2015. - */ +/** Created by Mikhail Kokho on 7/10/2015. + */ object AdderScala { def add(x: Int, y: Int) = x + y diff --git a/src/sbt-test/scoverage/aggregate-only/partB/src/main/scala/org/scoverage/issue53/part/b/SubtractorScala.scala b/src/sbt-test/scoverage/aggregate-only/partB/src/main/scala/org/scoverage/issue53/part/b/SubtractorScala.scala index e6da85fd..fbb7dcda 100644 --- a/src/sbt-test/scoverage/aggregate-only/partB/src/main/scala/org/scoverage/issue53/part/b/SubtractorScala.scala +++ b/src/sbt-test/scoverage/aggregate-only/partB/src/main/scala/org/scoverage/issue53/part/b/SubtractorScala.scala @@ -1,9 +1,7 @@ - package org.scoverage.issue53.part.b -/** - * Created by Mikhail Kokho on 7/10/2015. - */ +/** Created by Mikhail Kokho on 7/10/2015. + */ object SubtractorScala { def minus(x: Int, y: Int) = x - y diff --git a/src/sbt-test/scoverage/aggregate-only/project/plugins.sbt b/src/sbt-test/scoverage/aggregate-only/project/plugins.sbt index 8f2837b3..8d349239 100644 --- a/src/sbt-test/scoverage/aggregate-only/project/plugins.sbt +++ b/src/sbt-test/scoverage/aggregate-only/project/plugins.sbt @@ -2,7 +2,9 @@ val pluginVersion = sys.props.getOrElse( "plugin.version", throw new RuntimeException( """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)) + |Specify this property using the scriptedLaunchOpts -D.""".stripMargin + ) +) addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion) diff --git a/src/sbt-test/scoverage/aggregate/partA/src/main/scala/org/scoverage/issue53/part/a/AdderScala.scala b/src/sbt-test/scoverage/aggregate/partA/src/main/scala/org/scoverage/issue53/part/a/AdderScala.scala index 30415c1d..96b580e3 100644 --- a/src/sbt-test/scoverage/aggregate/partA/src/main/scala/org/scoverage/issue53/part/a/AdderScala.scala +++ b/src/sbt-test/scoverage/aggregate/partA/src/main/scala/org/scoverage/issue53/part/a/AdderScala.scala @@ -1,8 +1,7 @@ package org.scoverage.issue53.part.a -/** - * Created by Mikhail Kokho on 7/10/2015. - */ +/** Created by Mikhail Kokho on 7/10/2015. + */ object AdderScala { def add(x: Int, y: Int) = x + y diff --git a/src/sbt-test/scoverage/aggregate/partB/src/main/scala/org/scoverage/issue53/part/b/SubtractorScala.scala b/src/sbt-test/scoverage/aggregate/partB/src/main/scala/org/scoverage/issue53/part/b/SubtractorScala.scala index e6da85fd..fbb7dcda 100644 --- a/src/sbt-test/scoverage/aggregate/partB/src/main/scala/org/scoverage/issue53/part/b/SubtractorScala.scala +++ b/src/sbt-test/scoverage/aggregate/partB/src/main/scala/org/scoverage/issue53/part/b/SubtractorScala.scala @@ -1,9 +1,7 @@ - package org.scoverage.issue53.part.b -/** - * Created by Mikhail Kokho on 7/10/2015. - */ +/** Created by Mikhail Kokho on 7/10/2015. + */ object SubtractorScala { def minus(x: Int, y: Int) = x - y diff --git a/src/sbt-test/scoverage/aggregate/project/plugins.sbt b/src/sbt-test/scoverage/aggregate/project/plugins.sbt index 8f2837b3..8d349239 100644 --- a/src/sbt-test/scoverage/aggregate/project/plugins.sbt +++ b/src/sbt-test/scoverage/aggregate/project/plugins.sbt @@ -2,7 +2,9 @@ val pluginVersion = sys.props.getOrElse( "plugin.version", throw new RuntimeException( """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)) + |Specify this property using the scriptedLaunchOpts -D.""".stripMargin + ) +) addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion) diff --git a/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt b/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt index 97ccf122..56f70037 100644 --- a/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt @@ -9,6 +9,11 @@ coverageMinimumBranchPerFile := 80 coverageFailOnMinimum := true resolvers ++= { - if (sys.props.get("plugin.version").map(_.endsWith("-SNAPSHOT")).getOrElse(false)) Seq(Resolver.sonatypeRepo("snapshots")) + if ( + sys.props + .get("plugin.version") + .map(_.endsWith("-SNAPSHOT")) + .getOrElse(false) + ) Seq(Resolver.sonatypeRepo("snapshots")) else Seq.empty } diff --git a/src/sbt-test/scoverage/bad-coverage-file-branch/project/plugins.sbt b/src/sbt-test/scoverage/bad-coverage-file-branch/project/plugins.sbt index 8f2837b3..8d349239 100644 --- a/src/sbt-test/scoverage/bad-coverage-file-branch/project/plugins.sbt +++ b/src/sbt-test/scoverage/bad-coverage-file-branch/project/plugins.sbt @@ -2,7 +2,9 @@ val pluginVersion = sys.props.getOrElse( "plugin.version", throw new RuntimeException( """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)) + |Specify this property using the scriptedLaunchOpts -D.""".stripMargin + ) +) addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion) diff --git a/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt b/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt index 5da5b2c5..9da543b4 100644 --- a/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt @@ -9,6 +9,11 @@ coverageMinimumStmtPerFile := 90 coverageFailOnMinimum := true resolvers ++= { - if (sys.props.get("plugin.version").map(_.endsWith("-SNAPSHOT")).getOrElse(false)) Seq(Resolver.sonatypeRepo("snapshots")) + if ( + sys.props + .get("plugin.version") + .map(_.endsWith("-SNAPSHOT")) + .getOrElse(false) + ) Seq(Resolver.sonatypeRepo("snapshots")) else Seq.empty } diff --git a/src/sbt-test/scoverage/bad-coverage-file-stmt/project/plugins.sbt b/src/sbt-test/scoverage/bad-coverage-file-stmt/project/plugins.sbt index 8f2837b3..8d349239 100644 --- a/src/sbt-test/scoverage/bad-coverage-file-stmt/project/plugins.sbt +++ b/src/sbt-test/scoverage/bad-coverage-file-stmt/project/plugins.sbt @@ -2,7 +2,9 @@ val pluginVersion = sys.props.getOrElse( "plugin.version", throw new RuntimeException( """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)) + |Specify this property using the scriptedLaunchOpts -D.""".stripMargin + ) +) addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion) diff --git a/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt b/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt index 7390cca4..748cf6e4 100644 --- a/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt @@ -9,6 +9,11 @@ coverageMinimumBranchPerPackage := 80 coverageFailOnMinimum := true resolvers ++= { - if (sys.props.get("plugin.version").map(_.endsWith("-SNAPSHOT")).getOrElse(false)) Seq(Resolver.sonatypeRepo("snapshots")) + if ( + sys.props + .get("plugin.version") + .map(_.endsWith("-SNAPSHOT")) + .getOrElse(false) + ) Seq(Resolver.sonatypeRepo("snapshots")) else Seq.empty } diff --git a/src/sbt-test/scoverage/bad-coverage-package-branch/project/plugins.sbt b/src/sbt-test/scoverage/bad-coverage-package-branch/project/plugins.sbt index 8f2837b3..8d349239 100644 --- a/src/sbt-test/scoverage/bad-coverage-package-branch/project/plugins.sbt +++ b/src/sbt-test/scoverage/bad-coverage-package-branch/project/plugins.sbt @@ -2,7 +2,9 @@ val pluginVersion = sys.props.getOrElse( "plugin.version", throw new RuntimeException( """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)) + |Specify this property using the scriptedLaunchOpts -D.""".stripMargin + ) +) addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion) diff --git a/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt b/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt index 1b0556a6..18176ee4 100644 --- a/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt @@ -9,6 +9,11 @@ coverageMinimumStmtPerPackage := 80 coverageFailOnMinimum := true resolvers ++= { - if (sys.props.get("plugin.version").map(_.endsWith("-SNAPSHOT")).getOrElse(false)) Seq(Resolver.sonatypeRepo("snapshots")) + if ( + sys.props + .get("plugin.version") + .map(_.endsWith("-SNAPSHOT")) + .getOrElse(false) + ) Seq(Resolver.sonatypeRepo("snapshots")) else Seq.empty } diff --git a/src/sbt-test/scoverage/bad-coverage-package-stmt/project/plugins.sbt b/src/sbt-test/scoverage/bad-coverage-package-stmt/project/plugins.sbt index 8f2837b3..8d349239 100644 --- a/src/sbt-test/scoverage/bad-coverage-package-stmt/project/plugins.sbt +++ b/src/sbt-test/scoverage/bad-coverage-package-stmt/project/plugins.sbt @@ -2,7 +2,9 @@ val pluginVersion = sys.props.getOrElse( "plugin.version", throw new RuntimeException( """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)) + |Specify this property using the scriptedLaunchOpts -D.""".stripMargin + ) +) addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion) diff --git a/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt b/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt index 3708759e..33b3c8d2 100644 --- a/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt @@ -9,6 +9,11 @@ coverageMinimumBranchTotal := 80 coverageFailOnMinimum := true resolvers ++= { - if (sys.props.get("plugin.version").map(_.endsWith("-SNAPSHOT")).getOrElse(false)) Seq(Resolver.sonatypeRepo("snapshots")) + if ( + sys.props + .get("plugin.version") + .map(_.endsWith("-SNAPSHOT")) + .getOrElse(false) + ) Seq(Resolver.sonatypeRepo("snapshots")) else Seq.empty } diff --git a/src/sbt-test/scoverage/bad-coverage-total-branch/project/plugins.sbt b/src/sbt-test/scoverage/bad-coverage-total-branch/project/plugins.sbt index 8f2837b3..8d349239 100644 --- a/src/sbt-test/scoverage/bad-coverage-total-branch/project/plugins.sbt +++ b/src/sbt-test/scoverage/bad-coverage-total-branch/project/plugins.sbt @@ -2,7 +2,9 @@ val pluginVersion = sys.props.getOrElse( "plugin.version", throw new RuntimeException( """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)) + |Specify this property using the scriptedLaunchOpts -D.""".stripMargin + ) +) addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion) diff --git a/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt b/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt index fd782053..46ad59a2 100644 --- a/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt @@ -9,6 +9,11 @@ coverageMinimumStmtTotal := 80 coverageFailOnMinimum := true resolvers ++= { - if (sys.props.get("plugin.version").map(_.endsWith("-SNAPSHOT")).getOrElse(false)) Seq(Resolver.sonatypeRepo("snapshots")) + if ( + sys.props + .get("plugin.version") + .map(_.endsWith("-SNAPSHOT")) + .getOrElse(false) + ) Seq(Resolver.sonatypeRepo("snapshots")) else Seq.empty } diff --git a/src/sbt-test/scoverage/bad-coverage-total-stmt/project/plugins.sbt b/src/sbt-test/scoverage/bad-coverage-total-stmt/project/plugins.sbt index 8f2837b3..8d349239 100644 --- a/src/sbt-test/scoverage/bad-coverage-total-stmt/project/plugins.sbt +++ b/src/sbt-test/scoverage/bad-coverage-total-stmt/project/plugins.sbt @@ -2,7 +2,9 @@ val pluginVersion = sys.props.getOrElse( "plugin.version", throw new RuntimeException( """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)) + |Specify this property using the scriptedLaunchOpts -D.""".stripMargin + ) +) addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion) diff --git a/src/sbt-test/scoverage/bad-coverage/project/plugins.sbt b/src/sbt-test/scoverage/bad-coverage/project/plugins.sbt index 8f2837b3..8d349239 100644 --- a/src/sbt-test/scoverage/bad-coverage/project/plugins.sbt +++ b/src/sbt-test/scoverage/bad-coverage/project/plugins.sbt @@ -2,7 +2,9 @@ val pluginVersion = sys.props.getOrElse( "plugin.version", throw new RuntimeException( """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)) + |Specify this property using the scriptedLaunchOpts -D.""".stripMargin + ) +) addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion) diff --git a/src/sbt-test/scoverage/bad-coverage/src/main/scala/BadCoverage.scala b/src/sbt-test/scoverage/bad-coverage/src/main/scala/BadCoverage.scala index 9735241d..29663d06 100644 --- a/src/sbt-test/scoverage/bad-coverage/src/main/scala/BadCoverage.scala +++ b/src/sbt-test/scoverage/bad-coverage/src/main/scala/BadCoverage.scala @@ -7,4 +7,4 @@ object BadCoverage { def mult(num1: Int, num2: Int) = { num1 * num2 } -} \ No newline at end of file +} diff --git a/src/sbt-test/scoverage/coverage-off/project/plugins.sbt b/src/sbt-test/scoverage/coverage-off/project/plugins.sbt index 8f2837b3..8d349239 100644 --- a/src/sbt-test/scoverage/coverage-off/project/plugins.sbt +++ b/src/sbt-test/scoverage/coverage-off/project/plugins.sbt @@ -2,7 +2,9 @@ val pluginVersion = sys.props.getOrElse( "plugin.version", throw new RuntimeException( """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)) + |Specify this property using the scriptedLaunchOpts -D.""".stripMargin + ) +) addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion) diff --git a/src/sbt-test/scoverage/good-coverage/project/plugins.sbt b/src/sbt-test/scoverage/good-coverage/project/plugins.sbt index 8f2837b3..8d349239 100644 --- a/src/sbt-test/scoverage/good-coverage/project/plugins.sbt +++ b/src/sbt-test/scoverage/good-coverage/project/plugins.sbt @@ -2,7 +2,9 @@ val pluginVersion = sys.props.getOrElse( "plugin.version", throw new RuntimeException( """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)) + |Specify this property using the scriptedLaunchOpts -D.""".stripMargin + ) +) addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion) diff --git a/src/sbt-test/scoverage/preserve-set/project/plugins.sbt b/src/sbt-test/scoverage/preserve-set/project/plugins.sbt index 8f2837b3..8d349239 100644 --- a/src/sbt-test/scoverage/preserve-set/project/plugins.sbt +++ b/src/sbt-test/scoverage/preserve-set/project/plugins.sbt @@ -2,7 +2,9 @@ val pluginVersion = sys.props.getOrElse( "plugin.version", throw new RuntimeException( """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)) + |Specify this property using the scriptedLaunchOpts -D.""".stripMargin + ) +) addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion) diff --git a/src/sbt-test/scoverage/scalac-plugin-version/project/plugins.sbt b/src/sbt-test/scoverage/scalac-plugin-version/project/plugins.sbt index 8f2837b3..8d349239 100644 --- a/src/sbt-test/scoverage/scalac-plugin-version/project/plugins.sbt +++ b/src/sbt-test/scoverage/scalac-plugin-version/project/plugins.sbt @@ -2,7 +2,9 @@ val pluginVersion = sys.props.getOrElse( "plugin.version", throw new RuntimeException( """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)) + |Specify this property using the scriptedLaunchOpts -D.""".stripMargin + ) +) addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion) diff --git a/src/sbt-test/scoverage/scalajs/project/plugins.sbt b/src/sbt-test/scoverage/scalajs/project/plugins.sbt index 7687f56d..3529aa34 100644 --- a/src/sbt-test/scoverage/scalajs/project/plugins.sbt +++ b/src/sbt-test/scoverage/scalajs/project/plugins.sbt @@ -2,7 +2,9 @@ val pluginVersion = sys.props.getOrElse( "plugin.version", throw new RuntimeException( """|The system property 'plugin.version' is not defined. - |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)) + |Specify this property using the scriptedLaunchOpts -D.""".stripMargin + ) +) addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion) diff --git a/src/sbt-test/scoverage/scalajs/sjstest/shared/src/main/scala/UnderTest.scala b/src/sbt-test/scoverage/scalajs/sjstest/shared/src/main/scala/UnderTest.scala index 66a31844..9b279395 100644 --- a/src/sbt-test/scoverage/scalajs/sjstest/shared/src/main/scala/UnderTest.scala +++ b/src/sbt-test/scoverage/scalajs/sjstest/shared/src/main/scala/UnderTest.scala @@ -1,4 +1,3 @@ - object UnderTest { def onJsAndJvm: String = "js and jvm"