Merge pull request typelevel#4071 from typelevel/update/series/3.x/sc…

…ala-library-2.13.14 Update scala-library to 2.13.14 in series/3.x
armanbilge · May 20, 2024 · 391f1e1 · 391f1e1
2 parents 169c8fe + d9fa9cc
commit 391f1e1
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 33 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-14]
-        scala: [3.3.3, 2.12.19, 2.13.12]
+        scala: [3.3.3, 2.12.19, 2.13.14]
         java:
           - temurin@8
           - temurin@11
@@ -256,7 +256,7 @@ jobs:
       - shell: bash
         run: sbt '++ ${{ matrix.scala }}' '${{ matrix.ci }}'
 
-      - if: (matrix.scala == '2.13.12' || matrix.scala == '3.3.3') && matrix.ci == 'ciJVM' && matrix.java == 'temurin@17'
+      - if: (matrix.scala == '2.13.14' || matrix.scala == '3.3.3') && matrix.ci == 'ciJVM' && matrix.java == 'temurin@17'
         shell: bash
         run: sbt '++ ${{ matrix.scala }}' docs/mdoc
 
@@ -271,7 +271,7 @@ jobs:
         run: example/test-js.sh ${{ matrix.scala }}
 
       - name: Test GraalVM Native Image
-        if: matrix.scala == '2.13.12' && matrix.java == 'graalvm@17' && matrix.os == 'ubuntu-latest'
+        if: matrix.scala == '2.13.14' && matrix.java == 'graalvm@17' && matrix.os == 'ubuntu-latest'
         shell: bash
         run: sbt '++ ${{ matrix.scala }}' graalVMExample/nativeImage graalVMExample/nativeImageRun
 
@@ -281,7 +281,7 @@ jobs:
         run: example/test-native.sh ${{ matrix.scala }}
 
       - name: Scalafix tests
-        if: matrix.scala == '2.13.12' && matrix.ci == 'ciJVM' && matrix.os == 'ubuntu-latest'
+        if: matrix.scala == '2.13.14' && matrix.ci == 'ciJVM' && matrix.os == 'ubuntu-latest'
         shell: bash
         run: |
           cd scalafix
@@ -452,52 +452,52 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.12, ciJVM)
+      - name: Download target directories (2.13.14, ciJVM)
         uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.12-ciJVM
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.14-ciJVM
 
-      - name: Inflate target directories (2.13.12, ciJVM)
+      - name: Inflate target directories (2.13.14, ciJVM)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.12, ciNative)
+      - name: Download target directories (2.13.14, ciNative)
         uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.12-ciNative
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.14-ciNative
 
-      - name: Inflate target directories (2.13.12, ciNative)
+      - name: Inflate target directories (2.13.14, ciNative)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.12, ciJS)
+      - name: Download target directories (2.13.14, ciJS)
         uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.12-ciJS
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.14-ciJS
 
-      - name: Inflate target directories (2.13.12, ciJS)
+      - name: Inflate target directories (2.13.14, ciJS)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.12, ciFirefox)
+      - name: Download target directories (2.13.14, ciFirefox)
         uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.12-ciFirefox
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.14-ciFirefox
 
-      - name: Inflate target directories (2.13.12, ciFirefox)
+      - name: Inflate target directories (2.13.14, ciFirefox)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.12, ciChrome)
+      - name: Download target directories (2.13.14, ciChrome)
         uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.12-ciChrome
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.14-ciChrome
 
-      - name: Inflate target directories (2.13.12, ciChrome)
+      - name: Inflate target directories (2.13.14, ciChrome)
         run: |
           tar xf targets.tar
           rm targets.tar

diff --git a/build.sbt b/build.sbt
@@ -113,7 +113,7 @@ val Windows = "windows-latest"
 val MacOS = "macos-14"
 
 val Scala212 = "2.12.19"
-val Scala213 = "2.13.12"
+val Scala213 = "2.13.14"
 val Scala3 = "3.3.3"
 
 ThisBuild / crossScalaVersions := Seq(Scala3, Scala212, Scala213)

diff --git a/core/js/src/main/scala/cats/effect/process.scala b/core/js/src/main/scala/cats/effect/process.scala
@@ -18,7 +18,6 @@ package cats.effect
 
 import cats.data.OptionT
 import cats.effect.std.Env
-import cats.syntax.all._
 
 import scala.scalajs.js
 import scala.util.Try

diff --git a/core/js/src/main/scala/cats/effect/syntax/DispatcherSyntax.scala b/core/js/src/main/scala/cats/effect/syntax/DispatcherSyntax.scala
@@ -45,7 +45,7 @@ final class DispatcherOps[F[_]] private[syntax] (private[syntax] val wrapped: Di
   def unsafeRunSyncToFuture[A](fa: F[A], syncLimit: Int)(implicit F: Async[F]): Future[A] =
     F.syncStep[SyncIO, A](fa, syncLimit).attempt.unsafeRunSync() match {
       case Left(t) => Future.failed(t)
-      case Right(Left(fa)) => wrapped.unsafeToFuture(fa)
+      case Right(Left(fa1)) => wrapped.unsafeToFuture(fa1)
       case Right(Right(a)) => Future.successful(a)
     }
 
@@ -63,7 +63,7 @@ final class DispatcherOps[F[_]] private[syntax] (private[syntax] val wrapped: Di
   def unsafeRunSyncToPromise[A](fa: F[A], syncLimit: Int)(implicit F: Async[F]): Promise[A] =
     F.syncStep[SyncIO, A](fa, syncLimit).attempt.unsafeRunSync() match {
       case Left(t) => Promise.reject(t)
-      case Right(Left(fa)) => wrapped.unsafeToPromise(fa)
+      case Right(Left(fa1)) => wrapped.unsafeToPromise(fa1)
       case Right(Right(a)) => Promise.resolve[A](a)
     }
 

diff --git a/kernel/shared/src/main/scala/cats/effect/kernel/Outcome.scala b/kernel/shared/src/main/scala/cats/effect/kernel/Outcome.scala
@@ -229,8 +229,8 @@ object Outcome extends LowPriorityImplicits {
         }
 
       @tailrec
-      def tailRecM[A, B](a: A)(f: A => Outcome[F, E, Either[A, B]]): Outcome[F, E, B] =
-        f(a) match {
+      def tailRecM[A, B](a0: A)(f: A => Outcome[F, E, Either[A, B]]): Outcome[F, E, B] =
+        f(a0) match {
           case Succeeded(fa) =>
             Traverse[F].sequence[Either[A, *], B](fa) match { // Dotty can't infer this
               case Left(a) => tailRecM(a)(f)

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.9
+sbt.version=1.10.0
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -8,5 +8,5 @@ addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")
 addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")
-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1")
 addSbtPlugin("org.scalameta" % "sbt-native-image" % "0.3.4")
diff --git a/scalafix/project/build.properties b/scalafix/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.9
+sbt.version=1.10.0
diff --git a/scalafix/project/plugins.sbt b/scalafix/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1")
diff --git a/std/js/src/main/scala/cats/effect/std/EnvCompanionPlatform.scala b/std/js/src/main/scala/cats/effect/std/EnvCompanionPlatform.scala
@@ -18,7 +18,6 @@ package cats.effect.std
 
 import cats.data.OptionT
 import cats.effect.kernel.Sync
-import cats.syntax.all._
 
 import scala.collection.immutable.Iterable
 import scala.scalajs.js

diff --git a/tests/jvm/src/test/scala/cats/effect/unsafe/WorkerThreadNameSpec.scala b/tests/jvm/src/test/scala/cats/effect/unsafe/WorkerThreadNameSpec.scala
@@ -16,7 +16,7 @@
 
 package cats.effect.unsafe
 
-import cats.effect.{BaseSpec /*, IO*/}
+import cats.effect.BaseSpec
 import cats.effect.testkit.TestInstances
 
 import scala.concurrent.duration._

diff --git a/tests/shared/src/test/scala/cats/effect/IOSpec.scala b/tests/shared/src/test/scala/cats/effect/IOSpec.scala
@@ -1882,9 +1882,9 @@ class IOSpec extends BaseSpec with Discipline with IOPlatformSpecification {
 
       "timeoutAndForget" should {
         "terminate on an uncancelable fiber" in real {
-          IO.never.uncancelable.timeoutAndForget(1.second).attempt flatMap { e =>
+          IO.never.uncancelable.timeoutAndForget(1.second).attempt flatMap { r =>
             IO {
-              e must beLike { case Left(e) => e must haveClass[TimeoutException] }
+              r must beLike { case Left(e) => e must haveClass[TimeoutException] }
             }
           }
         }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
		addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1")