From 9e675dadd7757c91700f47db58d560ece827a98a Mon Sep 17 00:00:00 2001 From: Vladislav Ugryumov Date: Wed, 3 Apr 2024 02:36:20 +0300 Subject: [PATCH] Revert renaming non migrated module. --- .../main/{scala => scala-2}/tofu/common/derived/display.scala | 0 .../{scala => scala-2}/tofu/data/derived/InitDerivation.scala | 0 .../src/main/{scala => scala-2}/tofu/data/derived/Merge.scala | 0 .../{scala => scala-2}/tofu/data/derived/MerkatorFromCats.scala | 0 .../src/main/{scala => scala-2}/tofu/data/derived/package.scala | 0 .../tofu/higherKind/derived/ContextEmbed.scala | 0 .../{scala => scala-2}/tofu/higherKind/derived/derived.scala | 0 .../src/main/{scala => scala-2}/tofu/syntax/merge.scala | 0 .../{scala => scala-2}/tofu/common/derived/DisplaySpec.scala | 0 .../test/{scala => scala-2}/tofu/data/derived/MergeSuite.scala | 0 .../{scala => scala-2}/tofu/higherKind/derived/EmbedSuite.scala | 0 .../tofu/higherKind/derived/RepresentableKSuite.scala | 0 .../tofu/higherKind/derived/RepresentableKVarArgSuite.scala | 0 .../src/main/scala/tofu/logging/LoggableInstances.scala | 2 +- 14 files changed, 1 insertion(+), 1 deletion(-) rename modules/derivation/src/main/{scala => scala-2}/tofu/common/derived/display.scala (100%) rename modules/derivation/src/main/{scala => scala-2}/tofu/data/derived/InitDerivation.scala (100%) rename modules/derivation/src/main/{scala => scala-2}/tofu/data/derived/Merge.scala (100%) rename modules/derivation/src/main/{scala => scala-2}/tofu/data/derived/MerkatorFromCats.scala (100%) rename modules/derivation/src/main/{scala => scala-2}/tofu/data/derived/package.scala (100%) rename modules/derivation/src/main/{scala => scala-2}/tofu/higherKind/derived/ContextEmbed.scala (100%) rename modules/derivation/src/main/{scala => scala-2}/tofu/higherKind/derived/derived.scala (100%) rename modules/derivation/src/main/{scala => scala-2}/tofu/syntax/merge.scala (100%) rename modules/derivation/src/test/{scala => scala-2}/tofu/common/derived/DisplaySpec.scala (100%) rename modules/derivation/src/test/{scala => scala-2}/tofu/data/derived/MergeSuite.scala (100%) rename modules/derivation/src/test/{scala => scala-2}/tofu/higherKind/derived/EmbedSuite.scala (100%) rename modules/derivation/src/test/{scala => scala-2}/tofu/higherKind/derived/RepresentableKSuite.scala (100%) rename modules/derivation/src/test/{scala => scala-2}/tofu/higherKind/derived/RepresentableKVarArgSuite.scala (100%) diff --git a/modules/derivation/src/main/scala/tofu/common/derived/display.scala b/modules/derivation/src/main/scala-2/tofu/common/derived/display.scala similarity index 100% rename from modules/derivation/src/main/scala/tofu/common/derived/display.scala rename to modules/derivation/src/main/scala-2/tofu/common/derived/display.scala diff --git a/modules/derivation/src/main/scala/tofu/data/derived/InitDerivation.scala b/modules/derivation/src/main/scala-2/tofu/data/derived/InitDerivation.scala similarity index 100% rename from modules/derivation/src/main/scala/tofu/data/derived/InitDerivation.scala rename to modules/derivation/src/main/scala-2/tofu/data/derived/InitDerivation.scala diff --git a/modules/derivation/src/main/scala/tofu/data/derived/Merge.scala b/modules/derivation/src/main/scala-2/tofu/data/derived/Merge.scala similarity index 100% rename from modules/derivation/src/main/scala/tofu/data/derived/Merge.scala rename to modules/derivation/src/main/scala-2/tofu/data/derived/Merge.scala diff --git a/modules/derivation/src/main/scala/tofu/data/derived/MerkatorFromCats.scala b/modules/derivation/src/main/scala-2/tofu/data/derived/MerkatorFromCats.scala similarity index 100% rename from modules/derivation/src/main/scala/tofu/data/derived/MerkatorFromCats.scala rename to modules/derivation/src/main/scala-2/tofu/data/derived/MerkatorFromCats.scala diff --git a/modules/derivation/src/main/scala/tofu/data/derived/package.scala b/modules/derivation/src/main/scala-2/tofu/data/derived/package.scala similarity index 100% rename from modules/derivation/src/main/scala/tofu/data/derived/package.scala rename to modules/derivation/src/main/scala-2/tofu/data/derived/package.scala diff --git a/modules/derivation/src/main/scala/tofu/higherKind/derived/ContextEmbed.scala b/modules/derivation/src/main/scala-2/tofu/higherKind/derived/ContextEmbed.scala similarity index 100% rename from modules/derivation/src/main/scala/tofu/higherKind/derived/ContextEmbed.scala rename to modules/derivation/src/main/scala-2/tofu/higherKind/derived/ContextEmbed.scala diff --git a/modules/derivation/src/main/scala/tofu/higherKind/derived/derived.scala b/modules/derivation/src/main/scala-2/tofu/higherKind/derived/derived.scala similarity index 100% rename from modules/derivation/src/main/scala/tofu/higherKind/derived/derived.scala rename to modules/derivation/src/main/scala-2/tofu/higherKind/derived/derived.scala diff --git a/modules/derivation/src/main/scala/tofu/syntax/merge.scala b/modules/derivation/src/main/scala-2/tofu/syntax/merge.scala similarity index 100% rename from modules/derivation/src/main/scala/tofu/syntax/merge.scala rename to modules/derivation/src/main/scala-2/tofu/syntax/merge.scala diff --git a/modules/derivation/src/test/scala/tofu/common/derived/DisplaySpec.scala b/modules/derivation/src/test/scala-2/tofu/common/derived/DisplaySpec.scala similarity index 100% rename from modules/derivation/src/test/scala/tofu/common/derived/DisplaySpec.scala rename to modules/derivation/src/test/scala-2/tofu/common/derived/DisplaySpec.scala diff --git a/modules/derivation/src/test/scala/tofu/data/derived/MergeSuite.scala b/modules/derivation/src/test/scala-2/tofu/data/derived/MergeSuite.scala similarity index 100% rename from modules/derivation/src/test/scala/tofu/data/derived/MergeSuite.scala rename to modules/derivation/src/test/scala-2/tofu/data/derived/MergeSuite.scala diff --git a/modules/derivation/src/test/scala/tofu/higherKind/derived/EmbedSuite.scala b/modules/derivation/src/test/scala-2/tofu/higherKind/derived/EmbedSuite.scala similarity index 100% rename from modules/derivation/src/test/scala/tofu/higherKind/derived/EmbedSuite.scala rename to modules/derivation/src/test/scala-2/tofu/higherKind/derived/EmbedSuite.scala diff --git a/modules/derivation/src/test/scala/tofu/higherKind/derived/RepresentableKSuite.scala b/modules/derivation/src/test/scala-2/tofu/higherKind/derived/RepresentableKSuite.scala similarity index 100% rename from modules/derivation/src/test/scala/tofu/higherKind/derived/RepresentableKSuite.scala rename to modules/derivation/src/test/scala-2/tofu/higherKind/derived/RepresentableKSuite.scala diff --git a/modules/derivation/src/test/scala/tofu/higherKind/derived/RepresentableKVarArgSuite.scala b/modules/derivation/src/test/scala-2/tofu/higherKind/derived/RepresentableKVarArgSuite.scala similarity index 100% rename from modules/derivation/src/test/scala/tofu/higherKind/derived/RepresentableKVarArgSuite.scala rename to modules/derivation/src/test/scala-2/tofu/higherKind/derived/RepresentableKVarArgSuite.scala diff --git a/modules/logging/structured/src/main/scala/tofu/logging/LoggableInstances.scala b/modules/logging/structured/src/main/scala/tofu/logging/LoggableInstances.scala index 96c15b5f8..f9f376140 100644 --- a/modules/logging/structured/src/main/scala/tofu/logging/LoggableInstances.scala +++ b/modules/logging/structured/src/main/scala/tofu/logging/LoggableInstances.scala @@ -139,7 +139,7 @@ class LoggableInstances { } final implicit def seqLoggable[A: Loggable]: Loggable[collection.Seq[A]] = fldLoggable[Iterable, A].narrow - final implicit def immutableSeqLoggable[A: Loggable]: Loggable[Seq[A]] = + final implicit def immutableSeqLoggable[A: Loggable]: Loggable[Seq[A]] = fldLoggable[Iterable, A].narrow final implicit def listLoggable[A: Loggable]: Loggable[List[A]] = fldLoggable[List, A]