Skip to content

Commit 3f7dbfa

Browse files
Update scalafmt-core to 3.3.3 (#437)
* Update scalafmt-core to 3.3.3 * Reformat with scalafmt 3.3.3 * Revert commit(s) 3391b7e, 8fbd07a * Update scalafmt-core to 3.3.3 * Reformat with scalafmt 3.3.3
1 parent 8ff251a commit 3f7dbfa

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

.scalafmt.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ spaces.inImportCurlyBraces = true
88
indentOperator.preset = spray
99
unindentTopLevelOperators = true
1010

11-
version=3.3.1
11+
version=3.3.3
1212

build.sbt

+12-12
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ val currentScalaVersion = "2.13.8"
77
inThisBuild(
88
Seq(
99
scalaVersion := currentScalaVersion,
10-
//Load version from the file so that Gradle/Shipkit and SBT use the same version
10+
// Load version from the file so that Gradle/Shipkit and SBT use the same version
1111
version := sys.env
1212
.get("PROJECT_VERSION")
1313
.filter(_.trim.nonEmpty)
@@ -25,9 +25,9 @@ inThisBuild(
2525
lazy val commonSettings =
2626
Seq(
2727
organization := "org.mockito",
28-
//Load version from the file so that Gradle/Shipkit and SBT use the same version
28+
// Load version from the file so that Gradle/Shipkit and SBT use the same version
2929
crossScalaVersions := Seq(currentScalaVersion, "2.12.15", "2.11.12"),
30-
scalafmtOnCompile := true,
30+
scalafmtOnCompile := true,
3131
scalacOptions ++= Seq(
3232
"-unchecked",
3333
"-feature",
@@ -81,14 +81,14 @@ lazy val publishSettings = Seq(
8181
)
8282

8383
lazy val noPublishingSettings = Seq(
84-
publish := {},
85-
publishLocal := {},
84+
publish := {},
85+
publishLocal := {},
8686
publishArtifact := false
8787
)
8888

8989
lazy val noCrossBuildSettings = Seq(
9090
crossScalaVersions := Nil,
91-
publish / skip := true
91+
publish / skip := true
9292
)
9393

9494
lazy val scalatest = (project in file("scalatest"))
@@ -149,7 +149,7 @@ lazy val common = (project in file("common"))
149149
commonSettings,
150150
noPublishingSettings,
151151
libraryDependencies ++= Dependencies.commonLibraries ++
152-
Dependencies.scalaReflection.value ++ Seq(
152+
Dependencies.scalaReflection.value ++ Seq(
153153
Dependencies.catsLaws.value % "test",
154154
Dependencies.scalacheck.value % "test"
155155
)
@@ -164,7 +164,7 @@ lazy val core = (project in file("core"))
164164
name := "mockito-scala",
165165
libraryDependencies ++= Dependencies.commonLibraries,
166166
libraryDependencies ++= Dependencies.scalaReflection.value,
167-
//TODO remove when we remove the deprecated classes in org.mockito.integrations.Dependencies.scalatest
167+
// TODO remove when we remove the deprecated classes in org.mockito.integrations.Dependencies.scalatest
168168
libraryDependencies += Dependencies.scalatest % "provided",
169169
// include the macro classes and resources in the main jar
170170
Compile / packageBin / mappings ++= (macroSub / Compile / packageBin / mappings).value,
@@ -187,8 +187,8 @@ lazy val macroSub = (project in file("macro"))
187187
noPublishingSettings,
188188
libraryDependencies ++= Dependencies.commonLibraries,
189189
libraryDependencies ++= Dependencies.scalaReflection.value,
190-
publish := {},
191-
publishLocal := {},
190+
publish := {},
191+
publishLocal := {},
192192
publishArtifact := false
193193
)
194194

@@ -197,8 +197,8 @@ lazy val macroCommon = (project in file("macro-common"))
197197
commonSettings,
198198
noPublishingSettings,
199199
libraryDependencies ++= Dependencies.scalaReflection.value,
200-
publish := {},
201-
publishLocal := {},
200+
publish := {},
201+
publishLocal := {},
202202
publishArtifact := false
203203
)
204204

project/Dependencies.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ object Dependencies {
4141
"org.typelevel" %% "cats-core" % "2.0.0" % "provided"
4242
}
4343
)
44-
val scalaz = "org.scalaz" %% "scalaz-core" % "7.3.6" % "provided"
44+
val scalaz = "org.scalaz" %% "scalaz-core" % "7.3.6" % "provided"
4545

4646
val catsLaws = Def.setting(
4747
if (scalaBinaryVersion.value == "3") {

0 commit comments

Comments
 (0)