adapt to submodule upgrade

core/build.gradle.kts

@@ -2,6 +2,6 @@ val vs: Versions = versions()
 
 dependencies {
 
-    api(project(":macro"))
-    testFixturesApi(testFixtures(project(":macro")))
+    api(project(":macro2"))
+    testFixturesApi(testFixtures(project(":macro2")))
 }

core/src/main/scala/shapesafe/core/debugging/ExpressionType.scala

@@ -1,7 +1,7 @@
 package shapesafe.core.debugging
 
 import ai.acyclic.prover.commons.graph.local.Local
-import ai.acyclic.prover.commons.meta2.ProductDiscovery
+import ai.acyclic.prover.commons.meta.ProductDiscovery
 
 trait ExpressionType extends CanPeek {}
 

core/src/main/scala/shapesafe/core/util/Constraint.scala

@@ -7,7 +7,7 @@ trait Constraint {}
 
 object Constraint {
 
-  import ai.acyclic.prover.commons.meta2.ScalaReflection._
+  import ai.acyclic.prover.commons.meta.ScalaReflection._
 
   // TODO: why reinventing the wheel? shapeless LUBConstraint is the same
   case class ElementOfType[Data <: HList, Element: TypeTag]() extends Constraint {

core/src/testFixtures/scala/shapesafe/BaseSpec.scala

@@ -1,7 +1,7 @@
 package shapesafe
 
 import ai.acyclic.prover.commons.testlib
-import ai.acyclic.prover.commons.meta2.ScalaReflection
+import ai.acyclic.prover.commons.meta.ScalaReflection
 import ai.acyclic.prover.commons.viz.TypeViz
 import shapesafe.m.viz.PeekCT
 import shapeless.{HList, Nat, Witness}

macro/src/main/scala/shapesafe/m/GenericMsgEmitter.scala → macro2/src/main/scala/shapesafe/m/GenericMsgEmitter.scala

@@ -1,6 +1,6 @@
 package shapesafe.m
 
-import ai.acyclic.prover.commons.meta2.Reflection
+import ai.acyclic.prover.commons.meta.ScalaReflection
 import singleton.ops.impl.Op
 
 import java.util.logging.Logger
@@ -35,7 +35,7 @@ object GenericMsgEmitter {
 
     def byType[A, SSS <: GenericMsgEmitter.EmitLevel](
         implicit
-        _ttg: Reflection.Runtime.TypeTag[A]
+        _ttg: ScalaReflection.TypeTag[A]
     ): GenericMsgEmitter[A, SSS] =
       macro Macros.byTypeTag[A, SSS]
 
@@ -101,8 +101,8 @@ object GenericMsgEmitter {
 
       val aa: Type = weakTypeOf[A]
 
-      val ttg: Reflection.Runtime.TypeTag[A] = c.eval(c.Expr[Reflection.Runtime.TypeTag[A]](c.untypecheck(q"${_ttg}")))
-      val v = Reflection.Runtime.typeView(ttg.tpe).singletonName
+      val ttg: ScalaReflection.TypeTag[A] = c.eval(c.Expr[ScalaReflection.TypeTag[A]](c.untypecheck(q"${_ttg}")))
+      val v = ScalaReflection.typeView(ttg.tpe).singletonName
 
       val ll = emitValue[LL](v)
 

macro/src/main/scala/shapesafe/m/MWithReflection.scala → macro2/src/main/scala/shapesafe/m/MWithReflection.scala

@@ -1,6 +1,6 @@
 package shapesafe.m
 
-import ai.acyclic.prover.commons.meta2.MacroReflection
+import ai.acyclic.prover.commons.refl.Reflection
 import ai.acyclic.prover.commons.viz.TypeViz
 
 import scala.reflect.macros.blackbox
@@ -18,7 +18,12 @@ trait MWithReflection {
     c.parse(name)
   }
 
-  lazy val refl = MacroReflection[u.type](c.universe)
+  object refl extends Reflection.CompileTime {
+
+    final override lazy val universe: MWithReflection.this.u.type = MWithReflection.this.u
+
+  }
+
   lazy val viz = TypeViz.default(refl)
 
 //  case class MacroError(message: String) extends Exception(message)

macro/src/main/scala/shapesafe/m/PeerType.scala → macro2/src/main/scala/shapesafe/m/PeerType.scala

@@ -51,7 +51,7 @@ object PeerType {
 
         case v: SingletonType =>
           val ttView = refl.typeView(v)
-          val baseTypes = ttView.baseTypes.map(_.self)
+          val baseTypes = ttView.baseTypes // .map(_.value)
 
           val chosen = baseTypes.flatMap {
             case NoType => None

macro/src/main/scala/shapesafe/m/viz/KindVizCT.scala → macro2/src/main/scala/shapesafe/m/viz/KindVizCT.scala

@@ -1,7 +1,7 @@
 package shapesafe.m.viz
 
-import ai.acyclic.prover.commons.meta2.format.Formats0.KindName
-import ai.acyclic.prover.commons.meta2.format.{EnableOvrd, TypeFormat}
+import ai.acyclic.prover.commons.viz.format.Formats0.KindName
+import ai.acyclic.prover.commons.viz.format.{EnableOvrd, TypeFormat}
 
 import scala.language.experimental.macros
 

macro/src/main/scala/shapesafe/m/viz/PeekCT.scala → macro2/src/main/scala/shapesafe/m/viz/PeekCT.scala

@@ -1,8 +1,8 @@
 package shapesafe.m.viz
 
-import ai.acyclic.prover.commons.meta2.format.Formats0.TypeInfo
-import ai.acyclic.prover.commons.meta2.format.Formats1.{RecursiveForm, Trials}
-import ai.acyclic.prover.commons.meta2.format.{FormatOvrd, TypeFormat}
+import ai.acyclic.prover.commons.viz.format.Formats0.TypeInfo
+import ai.acyclic.prover.commons.viz.format.Formats1.{RecursiveForm, Trials}
+import ai.acyclic.prover.commons.viz.format.{FormatOvrd, TypeFormat}
 
 import scala.language.experimental.macros
 

macro/src/main/scala/shapesafe/m/viz/TypeVizCT.scala → macro2/src/main/scala/shapesafe/m/viz/TypeVizCT.scala

@@ -1,6 +1,6 @@
 package shapesafe.m.viz
 
-import ai.acyclic.prover.commons.meta2.format.{Formats0, TypeFormat}
+import ai.acyclic.prover.commons.viz.format.{Formats0, TypeFormat}
 
 import scala.language.experimental.macros
 

macro/src/main/scala/shapesafe/m/viz/VizCTSystem.scala → macro2/src/main/scala/shapesafe/m/viz/VizCTSystem.scala

@@ -1,8 +1,8 @@
 package shapesafe.m.viz
 
 import ai.acyclic.prover.commons.HasOuter
-import ai.acyclic.prover.commons.meta2.format.TypeFormat
 import ai.acyclic.prover.commons.viz.TypeViz
+import ai.acyclic.prover.commons.viz.format.TypeFormat
 import shapesafe.m.{Emit, MWithReflection}
 import singleton.ops.+
 
@@ -110,7 +110,7 @@ object VizCTSystem {
         SELF <: VizCTSystem: c.WeakTypeTag
     ]: c.Tree = {
 
-      val tt: Type = weakTypeOf[T]
+      val tt = refl.TypeView(weakTypeOf[T])
 
       val (self, liftSelf) = getSystem(weakTypeOf[SELF].dealias)
 
@@ -124,7 +124,7 @@ object VizCTSystem {
             viz.withFormat(self.typeFormat).of(tt).diagram_hierarchy.toString
           } else {
 
-            refl.typeView(tt).formattedBy(self.typeFormat).text
+            refl.TypeOps(tt).formattedBy(self.typeFormat).text
           }
 
           str
@@ -136,7 +136,7 @@ object VizCTSystem {
             "[ ERROR ] " + e.toString
         }
 
-      q"$liftSelf.createInfoOf[$tt, $result]"
+      q"$liftSelf.createInfoOf[${tt.unbox}, $result]"
     }
 
     //    def T[A: WeakTypeTag]: Tree = {

macro/src/test/scala/shapesafe/m/viz/KindVizCTSpec.scala → macro2/src/test/scala/shapesafe/m/viz/KindVizCTSpec.scala

@@ -1,6 +1,6 @@
 package shapesafe.m.viz
 
-import ai.acyclic.prover.commons.meta2.format.FormatOvrd.{~~, SingletonName}
+import ai.acyclic.prover.commons.viz.format.FormatOvrd.{~~, SingletonName}
 import shapesafe.m.GenericMsgEmitter
 import shapeless.Witness
 import singleton.ops.+

settings.gradle.kts

@@ -12,10 +12,11 @@ include(":prover-commons")
 project(":prover-commons").projectDir = file("prover-commons/module")
 include(":prover-commons:core")
 include(":prover-commons:meta2")
+//include(":prover-commons:spark")
 
 include(
     // should be skipped on CI, contains local experiments only
-    ":macro",
+    ":macro2",
     // uses unstable & experimental scala features, should be modified very slowly & carefully
     ":core",
 //    // uses common scala features