feat: migrate to scala 3 v2 (#538)

This PR finish the scala 3 changes on #532 --------- Co-authored-by: Cristian Cantarero <[email protected]> Co-authored-by: alejandrobudy <[email protected]> Co-authored-by: Alejandro <[email protected]>
cb372 · Dec 3, 2024 · ab0134d · ab0134d
1 parent 7b14ac3
commit ab0134d
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 45 deletions.
diff --git a/modules/core/shared/src/main/scala/retry/implicits.scala b/modules/core/shared/src/main/scala/retry/implicits.scala
diff --git a/...d/src/main/scala/retry/syntax/retry.scala → ...main/scala/retry/syntax/RetrySyntax.scala b/...d/src/main/scala/retry/syntax/retry.scala → ...main/scala/retry/syntax/RetrySyntax.scala
@@ -3,18 +3,7 @@ package retry.syntax
 import retry.{RetryDetails, RetryPolicy}
 import cats.effect.Temporal
 
-trait RetrySyntax:
-  implicit final def retrySyntaxBase[M[_], A](
-      action: => M[A]
-  ): RetryingOps[M, A] =
-    new RetryingOps[M, A](action)
-
-  implicit final def retrySyntaxError[M[_], A](
-      action: => M[A]
-  ): RetryingErrorOps[M, A] =
-    new RetryingErrorOps[M, A](action)
-
-final class RetryingOps[M[_], A](action: => M[A]):
+extension [M[_], A](action: => M[A])
 
   def retryingOnFailures[E](
       wasSuccessful: A => M[Boolean],
@@ -27,7 +16,6 @@ final class RetryingOps[M[_], A](action: => M[A]):
       onFailure = onFailure
     )(action)
 
-final class RetryingErrorOps[M[_], A](action: => M[A]):
   def retryingOnAllErrors(
       policy: RetryPolicy[M],
       onError: (Throwable, RetryDetails) => M[Unit]
@@ -75,4 +63,4 @@ final class RetryingErrorOps[M[_], A](action: => M[A]):
       onFailure = onFailure,
       onError = onError
     )(action)
-end RetryingErrorOps
+end extension
diff --git a/modules/core/shared/src/main/scala/retry/syntax/all.scala b/modules/core/shared/src/main/scala/retry/syntax/all.scala
diff --git a/modules/core/shared/src/main/scala/retry/syntax/package.scala b/modules/core/shared/src/main/scala/retry/syntax/package.scala
diff --git a/modules/core/shared/src/test/scala/retry/SyntaxSuite.scala b/modules/core/shared/src/test/scala/retry/SyntaxSuite.scala
@@ -1,6 +1,6 @@
 package retry
 
-import retry.syntax.all.*
+import retry.syntax.*
 
 import scala.concurrent.duration.*
 import munit.CatsEffectSuite

diff --git a/modules/docs/src/main/mdoc/docs/combinators.md b/modules/docs/src/main/mdoc/docs/combinators.md
@@ -264,7 +264,7 @@ Instead of calling the combinators and passing in your action, you can call them
 as extension methods.
 
 ```scala mdoc:nest:silent
-import retry.syntax.all._
+import retry.syntax.*
 
 // To retry until you get a value you like
 IO(loadedDie.roll()).retryingOnFailures(

diff --git a/modules/docs/src/main/mdoc/docs/mtl-combinators.md b/modules/docs/src/main/mdoc/docs/mtl-combinators.md
@@ -154,8 +154,8 @@ import cats.effect.{Async, IO}
 import cats.syntax.functor._
 import cats.syntax.flatMap._
 import cats.mtl.Handle
-import retry.mtl.syntax.all._
-import retry.syntax.all._
+import retry.mtl.syntax.*
+import retry.syntax.*
 import scala.concurrent.duration._
 import cats.effect.unsafe.implicits.global
 

diff --git a/...c/main/scala/retry/mtl/syntax/retry.scala → .../scala/retry/mtl/syntax/RetrySyntax.scala b/...c/main/scala/retry/mtl/syntax/retry.scala → .../scala/retry/mtl/syntax/RetrySyntax.scala
@@ -4,14 +4,7 @@ import cats.effect.Temporal
 import cats.mtl.Handle
 import retry.{RetryDetails, RetryPolicy}
 
-trait RetrySyntax:
-  implicit final def retrySyntaxMtlError[M[_], A](
-      action: => M[A]
-  ): RetryingMtlErrorOps[M, A] =
-    new RetryingMtlErrorOps[M, A](action)
-
-final class RetryingMtlErrorOps[M[_], A](action: => M[A]):
-
+extension [M[_], A](action: M[A])
   def retryingOnAllMtlErrors[E](
       policy: RetryPolicy[M],
       onError: (E, RetryDetails) => M[Unit]

diff --git a/modules/mtl/shared/src/main/scala/retry/mtl/syntax/all.scala b/modules/mtl/shared/src/main/scala/retry/mtl/syntax/all.scala
diff --git a/modules/mtl/shared/src/main/scala/retry/mtl/syntax/package.scala b/modules/mtl/shared/src/main/scala/retry/mtl/syntax/package.scala
diff --git a/modules/mtl/shared/src/test/scala/retry/mtl/SyntaxSuite.scala b/modules/mtl/shared/src/test/scala/retry/mtl/SyntaxSuite.scala
@@ -2,8 +2,8 @@ package retry.mtl
 
 import cats.data.EitherT
 import munit.CatsEffectSuite
-import retry.syntax.all.*
-import retry.mtl.syntax.all.*
+import retry.syntax.*
+import retry.mtl.syntax.*
 import retry.{RetryDetails, RetryPolicies, RetryPolicy}
 
 import scala.concurrent.duration.*