From 1e95a61727c0657b905590def631069fdd356428 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 13 Nov 2021 13:59:04 +0100 Subject: [PATCH 1/4] Update scalafmt-core to 3.1.1 in series/3.x --- .scalafmt.conf | 2 +- scalafix/.scalafmt.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 7574e3b043..c30f7d0b20 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.1.0 +version = 3.1.1 runner.dialect = Scala213Source3 diff --git a/scalafix/.scalafmt.conf b/scalafix/.scalafmt.conf index 58caa7b725..e8c37e6e8c 100644 --- a/scalafix/.scalafmt.conf +++ b/scalafix/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.1.0 +version = 3.1.1 maxColumn = 100 spaces.inImportCurlyBraces = true project.excludeFilters = [ From 242e9046a163a89f51f8160beec6baa341b44a89 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 13 Nov 2021 13:59:25 +0100 Subject: [PATCH 2/4] Reformat with scalafmt 3.1.1 --- .../v3_0_0/output/src/main/scala/fix/BracketRewrites.scala | 5 ++--- scalafix/v3_0_0/output/src/main/scala/fix/PkgRewrites.scala | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/scalafix/v3_0_0/output/src/main/scala/fix/BracketRewrites.scala b/scalafix/v3_0_0/output/src/main/scala/fix/BracketRewrites.scala index 0313ac5e07..5697bed37e 100644 --- a/scalafix/v3_0_0/output/src/main/scala/fix/BracketRewrites.scala +++ b/scalafix/v3_0_0/output/src/main/scala/fix/BracketRewrites.scala @@ -2,7 +2,7 @@ package fix import cats.effect.IO import cats.effect.Sync -import cats.effect.{ MonadCancel, MonadCancelThrow } +import cats.effect.{MonadCancel, MonadCancelThrow} object BracketRewrites { MonadCancel.apply[IO, Throwable] @@ -16,8 +16,7 @@ object BracketRewrites { Sync[IO].guarantee(IO.unit, /* comment2 */ IO.unit) Sync[IO].guarantee( - IO.unit - , + IO.unit, IO.unit ) diff --git a/scalafix/v3_0_0/output/src/main/scala/fix/PkgRewrites.scala b/scalafix/v3_0_0/output/src/main/scala/fix/PkgRewrites.scala index 28bdc5d7c0..488beb1019 100644 --- a/scalafix/v3_0_0/output/src/main/scala/fix/PkgRewrites.scala +++ b/scalafix/v3_0_0/output/src/main/scala/fix/PkgRewrites.scala @@ -1,8 +1,8 @@ package fix import cats.effect.IO -import cats.{ ApplicativeThrow, MonadThrow } -import cats.effect.{ Deferred, Ref } +import cats.{ApplicativeThrow, MonadThrow} +import cats.effect.{Deferred, Ref} import cats.effect.std.Semaphore object PkgRewrites { From 89bcb69269740b28b858ffe9a5c5294f74846485 Mon Sep 17 00:00:00 2001 From: Vasil Vasilev Date: Sat, 13 Nov 2021 19:31:26 +0100 Subject: [PATCH 3/4] Revert changes to scalafix output files --- .../v3_0_0/output/src/main/scala/fix/BracketRewrites.scala | 5 +++-- scalafix/v3_0_0/output/src/main/scala/fix/PkgRewrites.scala | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scalafix/v3_0_0/output/src/main/scala/fix/BracketRewrites.scala b/scalafix/v3_0_0/output/src/main/scala/fix/BracketRewrites.scala index 5697bed37e..0313ac5e07 100644 --- a/scalafix/v3_0_0/output/src/main/scala/fix/BracketRewrites.scala +++ b/scalafix/v3_0_0/output/src/main/scala/fix/BracketRewrites.scala @@ -2,7 +2,7 @@ package fix import cats.effect.IO import cats.effect.Sync -import cats.effect.{MonadCancel, MonadCancelThrow} +import cats.effect.{ MonadCancel, MonadCancelThrow } object BracketRewrites { MonadCancel.apply[IO, Throwable] @@ -16,7 +16,8 @@ object BracketRewrites { Sync[IO].guarantee(IO.unit, /* comment2 */ IO.unit) Sync[IO].guarantee( - IO.unit, + IO.unit + , IO.unit ) diff --git a/scalafix/v3_0_0/output/src/main/scala/fix/PkgRewrites.scala b/scalafix/v3_0_0/output/src/main/scala/fix/PkgRewrites.scala index 488beb1019..28bdc5d7c0 100644 --- a/scalafix/v3_0_0/output/src/main/scala/fix/PkgRewrites.scala +++ b/scalafix/v3_0_0/output/src/main/scala/fix/PkgRewrites.scala @@ -1,8 +1,8 @@ package fix import cats.effect.IO -import cats.{ApplicativeThrow, MonadThrow} -import cats.effect.{Deferred, Ref} +import cats.{ ApplicativeThrow, MonadThrow } +import cats.effect.{ Deferred, Ref } import cats.effect.std.Semaphore object PkgRewrites { From 5f62f9ac1e3cd0c46105e9b6fceb330c7b72529c Mon Sep 17 00:00:00 2001 From: Vasil Vasilev Date: Sat, 13 Nov 2021 19:33:12 +0100 Subject: [PATCH 4/4] Change the new scalafix snapshot to a typelevel one --- scalafix/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scalafix/build.sbt b/scalafix/build.sbt index eb50a6f928..d1290fc599 100644 --- a/scalafix/build.sbt +++ b/scalafix/build.sbt @@ -57,7 +57,7 @@ lazy val v3_3_0_output = project .in(file("v3_3_0/output")) .settings( libraryDependencies ++= Seq( - "io.vasilev" %% "cats-effect" % "3.3-208-b352672" + "org.typelevel" %% "cats-effect" % "3.3-393-da7c7c7" ) )