Skip to content

Commit

Permalink
Merge pull request #363 from scala-steward/update/scalafmt-core-3.0.0
Browse files Browse the repository at this point in the history
Update scalafmt-core to 3.0.0
  • Loading branch information
ckipp01 authored Aug 19, 2021
2 parents ed3de78 + cf2dcac commit 828a491
Show file tree
Hide file tree
Showing 27 changed files with 88 additions and 37 deletions.
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = "2.7.5"
version = "3.0.0"
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion src/sbt-test/scoverage/aggregate-only/project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion src/sbt-test/scoverage/aggregate/project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
7 changes: 6 additions & 1 deletion src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
7 changes: 6 additions & 1 deletion src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
7 changes: 6 additions & 1 deletion src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
7 changes: 6 additions & 1 deletion src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
7 changes: 6 additions & 1 deletion src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
7 changes: 6 additions & 1 deletion src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 3 additions & 1 deletion src/sbt-test/scoverage/bad-coverage/project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ object BadCoverage {
def mult(num1: Int, num2: Int) = {
num1 * num2
}
}
}
4 changes: 3 additions & 1 deletion src/sbt-test/scoverage/coverage-off/project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 3 additions & 1 deletion src/sbt-test/scoverage/good-coverage/project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 3 additions & 1 deletion src/sbt-test/scoverage/preserve-set/project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 3 additions & 1 deletion src/sbt-test/scoverage/scalajs/project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

object UnderTest {
def onJsAndJvm: String = "js and jvm"

Expand Down

0 comments on commit 828a491

Please sign in to comment.