Skip to content

Commit

Permalink
Update scalafmt-core to 3.5.3 (#457)
Browse files Browse the repository at this point in the history
* Update scalafmt-core to 3.5.3

* Reformat with scalafmt 3.5.3
  • Loading branch information
scala-steward authored May 31, 2022
1 parent 9c4ebb5 commit 6cb6278
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.5.2
version = 3.5.3
runner.dialect = scala213
continuationIndent.defnSite = 2
docstrings.style = Asterisk
Expand Down
14 changes: 7 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ val finagleVersion = "21.8.0"

ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.8")

(Global / onChangedBuildSource) := ReloadOnSourceChanges
Global / onChangedBuildSource := ReloadOnSourceChanges

val docMappingsApiDir = settingKey[String]("Subdirectory in site target directory for API docs")

Expand All @@ -36,7 +36,7 @@ lazy val root = project
.enablePlugins(GhpagesPlugin, ScalaUnidocPlugin, NoPublishPlugin)
.settings(allSettings)
.settings(
(ScalaUnidoc / unidoc / unidocProjectFilter) := inAnyProject -- inProjects(
ScalaUnidoc / unidoc / unidocProjectFilter := inAnyProject -- inProjects(
benchmark,
effect3,
`scalafix-input`,
Expand All @@ -47,7 +47,7 @@ lazy val root = project
git.remoteRepo := "git@github.com:typelevel/catbird.git"
)
.settings(
(console / initialCommands) :=
console / initialCommands :=
"""
|import com.twitter.finagle._
|import com.twitter.util._
Expand All @@ -63,7 +63,7 @@ lazy val util = project
.settings(allSettings)
.settings(
libraryDependencies += "com.twitter" %% "util-core" % utilVersion,
(Test / scalacOptions) ~= {
Test / scalacOptions ~= {
_.filterNot(Set("-Yno-imports", "-Yno-predef"))
}
)
Expand All @@ -76,7 +76,7 @@ lazy val effect = project
"org.typelevel" %% "cats-effect" % catsEffectVersion,
"org.typelevel" %% "cats-effect-laws" % catsEffectVersion % Test
),
(Test / scalacOptions) ~= {
Test / scalacOptions ~= {
_.filterNot(Set("-Yno-imports", "-Yno-predef"))
}
)
Expand All @@ -92,7 +92,7 @@ lazy val effect3 = project
"org.typelevel" %% "cats-effect-laws" % catsEffect3Version % Test,
"org.typelevel" %% "cats-effect-testkit" % catsEffect3Version % Test
),
(Test / scalacOptions) ~= {
Test / scalacOptions ~= {
_.filterNot(Set("-Yno-imports", "-Yno-predef"))
}
)
Expand All @@ -103,7 +103,7 @@ lazy val finagle = project
.settings(allSettings)
.settings(
libraryDependencies += "com.twitter" %% "finagle-core" % finagleVersion,
(Test / scalacOptions) ~= {
Test / scalacOptions ~= {
_.filterNot(Set("-Yno-imports", "-Yno-predef"))
}
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import scala.concurrent.duration._
class RerunnableTimerSuite extends FixtureAnyFunSuite {

protected final class FixtureParam {
val twitterTimer: util.Timer = new util.JavaTimer()
val twitterTimer: util.Timer = new util.JavaTimer
}

test("A timer can be used to delay execution") { f =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@
package org.typelevel.catbird.scalafix

import cats.MonadError
import com.twitter.util.{Await, Future}
import com.twitter.util.{ Await, Future }
import io.catbird.util._

object RenameIoCatbirdPackage {
def apply()
(implicit F: MonadError[Future, Throwable]): Future[Unit] =
F.raiseError[Unit](new NotImplementedError())
def apply()(implicit F: MonadError[Future, Throwable]): Future[Unit] =
F.raiseError[Unit](new NotImplementedError)
}

object Main {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package org.typelevel.catbird.scalafix

import cats.MonadError
import com.twitter.util.{Await, Future}
import com.twitter.util.{ Await, Future }
import org.typelevel.catbird.util._

object RenameIoCatbirdPackage {
def apply()
(implicit F: MonadError[Future, Throwable]): Future[Unit] =
F.raiseError[Unit](new NotImplementedError())
def apply()(implicit F: MonadError[Future, Throwable]): Future[Unit] =
F.raiseError[Unit](new NotImplementedError)
}

object Main {
Expand Down

0 comments on commit 6cb6278

Please sign in to comment.