From e15c41fffd6c274ea40122c66808cd03e065c3db Mon Sep 17 00:00:00 2001 From: Roman-Statsura Date: Wed, 1 May 2024 20:02:25 +0400 Subject: [PATCH] Add support Scala 3 for module kernelCatsMtlInterop --- build.sbt | 3 ++- .../tofu/kernel/interop/catsmtl/CatsMTLTofuInstances.scala | 0 .../tofu/kernel/interop/catsmtl/TofuCatsMTLInstances.scala | 0 .../tofu/kernel/interop/catsmtl/instances.scala | 0 .../tofu/kernel/interop/catsmtl/mtlimplicits.scala | 0 .../tofu/kernel/interop/catsmtl/tofuimplicits.scala | 0 .../kernel/interop/catsmtl/CatsMtlFromTofuSummonChecks.scala | 0 .../kernel/interop/catsmtl/TofuCatsMtlExplicitChecks.scala | 0 .../kernel/interop/catsmtl/TofuFromCatsMtlSummonChecks.scala | 0 9 files changed, 2 insertions(+), 1 deletion(-) rename modules/kernel/interop/cats-mtl/src/main/{scala-2 => scala}/tofu/kernel/interop/catsmtl/CatsMTLTofuInstances.scala (100%) rename modules/kernel/interop/cats-mtl/src/main/{scala-2 => scala}/tofu/kernel/interop/catsmtl/TofuCatsMTLInstances.scala (100%) rename modules/kernel/interop/cats-mtl/src/main/{scala-2 => scala}/tofu/kernel/interop/catsmtl/instances.scala (100%) rename modules/kernel/interop/cats-mtl/src/main/{scala-2 => scala}/tofu/kernel/interop/catsmtl/mtlimplicits.scala (100%) rename modules/kernel/interop/cats-mtl/src/main/{scala-2 => scala}/tofu/kernel/interop/catsmtl/tofuimplicits.scala (100%) rename modules/kernel/interop/cats-mtl/src/test/{scala-2 => scala}/tofu/kernel/interop/catsmtl/CatsMtlFromTofuSummonChecks.scala (100%) rename modules/kernel/interop/cats-mtl/src/test/{scala-2 => scala}/tofu/kernel/interop/catsmtl/TofuCatsMtlExplicitChecks.scala (100%) rename modules/kernel/interop/cats-mtl/src/test/{scala-2 => scala}/tofu/kernel/interop/catsmtl/TofuFromCatsMtlSummonChecks.scala (100%) diff --git a/build.sbt b/build.sbt index f4686f106..dcc0d32da 100644 --- a/build.sbt +++ b/build.sbt @@ -118,10 +118,11 @@ lazy val kernelCatsMtlInterop = projectMatrix .in(modules / "kernel" / "interop" / "cats-mtl") .settings( defaultSettings, + scala3MigratedModuleOptions, name := "tofu-kernel-cats-mtl", libraryDependencies += catsMtl ) - .jvmPlatform(scala2Versions) + .jvmPlatform(scalaVersions = scala2And3Versions) .dependsOn(kernel) lazy val loggingStr = projectMatrix diff --git a/modules/kernel/interop/cats-mtl/src/main/scala-2/tofu/kernel/interop/catsmtl/CatsMTLTofuInstances.scala b/modules/kernel/interop/cats-mtl/src/main/scala/tofu/kernel/interop/catsmtl/CatsMTLTofuInstances.scala similarity index 100% rename from modules/kernel/interop/cats-mtl/src/main/scala-2/tofu/kernel/interop/catsmtl/CatsMTLTofuInstances.scala rename to modules/kernel/interop/cats-mtl/src/main/scala/tofu/kernel/interop/catsmtl/CatsMTLTofuInstances.scala diff --git a/modules/kernel/interop/cats-mtl/src/main/scala-2/tofu/kernel/interop/catsmtl/TofuCatsMTLInstances.scala b/modules/kernel/interop/cats-mtl/src/main/scala/tofu/kernel/interop/catsmtl/TofuCatsMTLInstances.scala similarity index 100% rename from modules/kernel/interop/cats-mtl/src/main/scala-2/tofu/kernel/interop/catsmtl/TofuCatsMTLInstances.scala rename to modules/kernel/interop/cats-mtl/src/main/scala/tofu/kernel/interop/catsmtl/TofuCatsMTLInstances.scala diff --git a/modules/kernel/interop/cats-mtl/src/main/scala-2/tofu/kernel/interop/catsmtl/instances.scala b/modules/kernel/interop/cats-mtl/src/main/scala/tofu/kernel/interop/catsmtl/instances.scala similarity index 100% rename from modules/kernel/interop/cats-mtl/src/main/scala-2/tofu/kernel/interop/catsmtl/instances.scala rename to modules/kernel/interop/cats-mtl/src/main/scala/tofu/kernel/interop/catsmtl/instances.scala diff --git a/modules/kernel/interop/cats-mtl/src/main/scala-2/tofu/kernel/interop/catsmtl/mtlimplicits.scala b/modules/kernel/interop/cats-mtl/src/main/scala/tofu/kernel/interop/catsmtl/mtlimplicits.scala similarity index 100% rename from modules/kernel/interop/cats-mtl/src/main/scala-2/tofu/kernel/interop/catsmtl/mtlimplicits.scala rename to modules/kernel/interop/cats-mtl/src/main/scala/tofu/kernel/interop/catsmtl/mtlimplicits.scala diff --git a/modules/kernel/interop/cats-mtl/src/main/scala-2/tofu/kernel/interop/catsmtl/tofuimplicits.scala b/modules/kernel/interop/cats-mtl/src/main/scala/tofu/kernel/interop/catsmtl/tofuimplicits.scala similarity index 100% rename from modules/kernel/interop/cats-mtl/src/main/scala-2/tofu/kernel/interop/catsmtl/tofuimplicits.scala rename to modules/kernel/interop/cats-mtl/src/main/scala/tofu/kernel/interop/catsmtl/tofuimplicits.scala diff --git a/modules/kernel/interop/cats-mtl/src/test/scala-2/tofu/kernel/interop/catsmtl/CatsMtlFromTofuSummonChecks.scala b/modules/kernel/interop/cats-mtl/src/test/scala/tofu/kernel/interop/catsmtl/CatsMtlFromTofuSummonChecks.scala similarity index 100% rename from modules/kernel/interop/cats-mtl/src/test/scala-2/tofu/kernel/interop/catsmtl/CatsMtlFromTofuSummonChecks.scala rename to modules/kernel/interop/cats-mtl/src/test/scala/tofu/kernel/interop/catsmtl/CatsMtlFromTofuSummonChecks.scala diff --git a/modules/kernel/interop/cats-mtl/src/test/scala-2/tofu/kernel/interop/catsmtl/TofuCatsMtlExplicitChecks.scala b/modules/kernel/interop/cats-mtl/src/test/scala/tofu/kernel/interop/catsmtl/TofuCatsMtlExplicitChecks.scala similarity index 100% rename from modules/kernel/interop/cats-mtl/src/test/scala-2/tofu/kernel/interop/catsmtl/TofuCatsMtlExplicitChecks.scala rename to modules/kernel/interop/cats-mtl/src/test/scala/tofu/kernel/interop/catsmtl/TofuCatsMtlExplicitChecks.scala diff --git a/modules/kernel/interop/cats-mtl/src/test/scala-2/tofu/kernel/interop/catsmtl/TofuFromCatsMtlSummonChecks.scala b/modules/kernel/interop/cats-mtl/src/test/scala/tofu/kernel/interop/catsmtl/TofuFromCatsMtlSummonChecks.scala similarity index 100% rename from modules/kernel/interop/cats-mtl/src/test/scala-2/tofu/kernel/interop/catsmtl/TofuFromCatsMtlSummonChecks.scala rename to modules/kernel/interop/cats-mtl/src/test/scala/tofu/kernel/interop/catsmtl/TofuFromCatsMtlSummonChecks.scala