Scala3 - WIP

build.sbt

@@ -129,7 +129,7 @@ lazy val core = (project in file("core"))
       PROVIDED(
         "org.neo4j.driver" % "neo4j-java-driver" % neo4jDriverVersion
       ) ++ COMPILE(
-        "com.chuusai" %% "shapeless" % shapelessVersion,
+        // "com.chuusai" %% "shapeless" % shapelessVersion,
         "org.scala-lang.modules" %% "scala-collection-compat" % scalaCollectionCompatVersion,
         scalaVersion("org.scala-lang" % "scala-reflect" % _).value
       ) ++ TEST(
@@ -139,7 +139,8 @@ lazy val core = (project in file("core"))
         "org.testcontainers" % "neo4j" % testcontainersNeo4jVersion,
         "org.mockito" % "mockito-all" % mockitoVersion,
         "ch.qos.logback" % "logback-classic" % logbackVersion
-      )
+      ),
+      dependsOn()
   )
 
 def enablePartialUnificationIn2_12(scalaVersion: String) =
@@ -263,6 +264,17 @@ lazy val enumeratum = (project in file("enumeratum"))
     )
   )
 
+lazy val generic = (project in file("generic"))  
+  .dependsOn(core % "compile->compile;test->test;provided->provided")
+  .settings(commonSettings)
+  .settings(
+    name := "neotypes-generic",
+    libraryDependencies ++= COMPILE(
+      "com.chuusai" %% "shapeless" % shapelessVersion,
+      scalaVersion("org.scala-lang" % "scala-reflect" % _).value
+    ),
+  )
+
 lazy val docsMappingsAPIDir = settingKey[String]("Name of subdirectory in site target directory for api docs")
 
 lazy val microsite = (project in file("site"))

core/src/main/scala/neotypes/generic/Exported.scala

@@ -1,3 +1,3 @@
 package neotypes.generic
 
-final case class Exported[+T](instance: T) extends AnyVal
+final case class Exported[+T](instance: T) extends AnyVal

core/src/main/scala/neotypes/mappers.scala

@@ -13,7 +13,7 @@ import org.neo4j.driver.internal.value.{MapValue, NodeValue, RelationshipValue}
 import org.neo4j.driver.Value
 import org.neo4j.driver.summary.ResultSummary
 import org.neo4j.driver.types.{IsoDuration, MapAccessor => NMap, Node, Path => NPath, Point, Relationship}
-import shapeless.HNil
+// import shapeless.HNil
 
 import scala.collection.Iterable
 import scala.collection.compat._
@@ -482,8 +482,10 @@ object mappers {
     implicit final val FloatValueMapper: ValueMapper[Float] =
       ValueMapper.fromCast(v => v.asFloat)
 
-    implicit final val HNilMapper: ValueMapper[HNil] =
-      ValueMapper.const(HNil)
+
+    // TODO moved temporarily to generic orphan instances
+    // implicit final val HNilMapper: ValueMapper[HNil] =
+    //   ValueMapper.const(HNil)
 
     implicit final val IntValueMapper: ValueMapper[Int] =
       ValueMapper.fromCast(v => v.asInt)

core/src/test/scala/neotypes/MapperSpec.scala

@@ -1,6 +1,6 @@
 package neotypes
 
-import neotypes.generic.auto._
+// import neotypes.generic.auto._
 import neotypes.mappers.{ResultMapper, TypeHint, ValueMapper}
 import org.neo4j.driver.internal.value.{IntegerValue, StringValue}
 import org.neo4j.driver.Value

generic/src/main/scala/neotypes/generic/Exported.scala

@@ -0,0 +1,3 @@
+package neotypes.generic
+
+final case class Exported[+T](instance: T) extends AnyVal

core/src/main/scala/neotypes/generic/ReprResultMapper.scala → generic/src/main/scala/neotypes/generic/ReprResultMapper.scala

@@ -19,7 +19,9 @@ object ReprResultMapper {
     nmap.keys.asScala.iterator.map(key => key -> nmap.get(key))
 
   implicit final val HNilResultMapper: ReprResultMapper[HNil] = {
-    val rm = ResultMapper.fromValueMapper[HNil](ValueMapper.HNilMapper)
+    // val rm = ResultMapper.fromValueMapper[HNil](ValueMapper.HNilMapper)
+    // TODO HNil mapper coming from orphan instances package obj
+    val rm = ResultMapper.fromValueMapper[HNil](HNilMapper)
 
     new ReprResultMapper[HNil] {
       override def to(value: List[(String, Value)], typeHint: Option[TypeHint]): Either[Throwable, HNil] =

generic/src/main/scala/neotypes/generic/package.scala

@@ -0,0 +1,12 @@
+package neotypes
+
+import neotypes.mappers.ValueMapper
+import shapeless.HNil
+
+package object generic extends OrphanInstances
+
+trait OrphanInstances {
+  implicit final val HNilMapper: ValueMapper[HNil] =
+    ValueMapper.const(HNil)
+
+}