Add support Scala 3 for module observable

tofu-tf · May 8, 2024 · 1eb533b · 1eb533b
1 parent 50599da
commit 1eb533b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/build.sbt b/build.sbt
@@ -292,11 +292,12 @@ lazy val observable = projectMatrix
   .in(util / "observable")
   .settings(
     defaultSettings,
+    scala3MigratedModuleOptions,
     libraryDependencies ++= Vector(monix, catsEffect2),
     libraryDependencies += scalatest,
     name := "tofu-observable",
   )
-  .jvmPlatform(scala2Versions)
+  .jvmPlatform(scalaVersions = scala2And3Versions)
 
 lazy val config = projectMatrix
   .in(util / "config")
@@ -344,7 +345,7 @@ lazy val zio2Core = projectMatrix
     libraryDependencies ++= List(zio2, zio2Cats),
     name := "tofu-zio2-core"
   )
-  .jvmPlatform(scala2Versions)
+  .jvmPlatform(scalaVersions = scala2And3Versions)
   .dependsOn(coreCE3)
 
 lazy val zio1Logging = projectMatrix

diff --git a/modules/interop/zio2/core/src/main/scala/tofu/zioFunctions.scala b/modules/interop/zio2/core/src/main/scala/tofu/zioFunctions.scala
@@ -9,7 +9,7 @@ import zio.{IO, ZIO, Tag => ZTag}
 import scala.annotation.nowarn
 
 object zioFunctions {
-  @nowarn("cat=unused-params")
+  @nowarn
   def expose[U[_[_, _]]: EmbedBK: FunctorBK: Tag.auto.T]: U[ZIO[U[IO], +_, +_]] =
     EmbedBK.of[ZIO[U[IO], +_, +_], U](ZIO.environmentWith(_.get[U[IO]](ZTag[U[IO]]).widenb))
 }
diff --git a/modules/interop/zio2/core/src/test/scala/tofu/zioInstances/ZioInstancesSuite.scala b/modules/interop/zio2/core/src/test/scala/tofu/zioInstances/ZioInstancesSuite.scala
@@ -40,7 +40,7 @@ object ZioInstancesSuite {
     ()
   }
 
-  @nowarn("cat=unused-params")
+  @nowarn
   def summonZioInstances[E, Env: Tag, Ctx: Tag](): Unit = {
     implicitly[WithRun[ZIO[Env with Ctx, E, _], ZIO[Env, E, _], Ctx]]
     implicitly[WithRun[ZIO[Ctx with Env, E, _], ZIO[Env, E, _], Ctx]]
@@ -49,7 +49,7 @@ object ZioInstancesSuite {
     ()
   }
 
-  @nowarn("cat=unused-params")
+  @nowarn
   def taskAmbiguity: Any = {
     import cats.effect.Sync
     import tofu.Raise

diff --git a/.../tofu/observable/TakeWhileInclusive.scala → .../tofu/observable/TakeWhileInclusive.scala b/.../tofu/observable/TakeWhileInclusive.scala → .../tofu/observable/TakeWhileInclusive.scala
diff --git a/...ain/scala-2/tofu/observable/package.scala → .../main/scala/tofu/observable/package.scala b/...ain/scala-2/tofu/observable/package.scala → .../main/scala/tofu/observable/package.scala
diff --git a/.../observable/TakeWhileInclusiveSuite.scala → .../observable/TakeWhileInclusiveSuite.scala b/.../observable/TakeWhileInclusiveSuite.scala → .../observable/TakeWhileInclusiveSuite.scala