upgrade submodule & adapt

tribbloid · Feb 6, 2024 · e8ae46b · e8ae46b
1 parent 853baf8
commit e8ae46b
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/buildSrc b/buildSrc
diff --git a/core/src/main/scala/shapesafe/core/arity/ConstArity.scala b/core/src/main/scala/shapesafe/core/arity/ConstArity.scala
@@ -1,12 +1,12 @@
 package shapesafe.core.arity
 
-import ai.acyclic.prover.commons.Same
+import ai.acyclic.prover.commons.same.Same
 import shapeless.Witness
 import shapesafe.core.XInt
 import shapesafe.core.arity.Utils.Op
 import singleton.ops.{==, Require}
 
-trait ConstArity[S] extends LeafArity with Same.ByEquality.Facade {
+trait ConstArity[S] extends LeafArity with Same.ByEquality.IWrapper {
 
   type SS = S
   def singleton: S

diff --git a/core/src/main/scala/shapesafe/core/axis/Axis.scala b/core/src/main/scala/shapesafe/core/axis/Axis.scala
@@ -1,6 +1,6 @@
 package shapesafe.core.axis
 
-import ai.acyclic.prover.commons.Same
+import ai.acyclic.prover.commons.same.Same
 import shapeless.Witness
 import shapeless.labelled.FieldType
 import shapesafe.core.arity.{Arity, ArityType, ConstArity}
@@ -9,7 +9,7 @@ import shapesafe.core.{XInt, XString}
 
 import scala.language.implicitConversions
 
-trait Axis extends AxisLike with Same.ByEquality.Facade with CanPeek {
+trait Axis extends AxisLike with Same.ByEquality.IWrapper with CanPeek {
   // TODO:; can be a subclass of shapeless KeyTag
 
   final type Field = FieldType[Name, _ArityType]

diff --git a/core/src/main/scala/shapesafe/core/shape/Index.scala b/core/src/main/scala/shapesafe/core/shape/Index.scala
@@ -2,10 +2,10 @@ package shapesafe.core.shape
 
 import shapesafe.core.arity.Utils.NatAsOp
 import shapesafe.core.debugging.CanPeek
-import ai.acyclic.prover.commons.Same
+import ai.acyclic.prover.commons.same.Same
 import shapeless.{Nat, Witness}
 
-trait Index extends Same.ByEquality.Facade with CanPeek {
+trait Index extends Same.ByEquality.IWrapper with CanPeek {
 
   def value: Any
   final override protected def samenessDelegatedTo = value

diff --git a/core/src/main/scala/shapesafe/core/tuple/Bone.scala b/core/src/main/scala/shapesafe/core/tuple/Bone.scala
@@ -2,7 +2,7 @@ package shapesafe.core.tuple
 
 import shapesafe.core.debugging.{CanPeek, Notations}
 import shapesafe.core.util.HListView
-import ai.acyclic.prover.commons.Same
+import ai.acyclic.prover.commons.same.Same
 import ai.acyclic.prover.commons.typesetting.TextBlock
 import shapeless.{::, HList, HNil, Witness}
 
@@ -12,7 +12,7 @@ trait Bone[VB] extends Tuples {
 
   final type VBound = VB
 
-  trait Tuple extends Same.ByEquality.Facade with CanPeek {
+  trait Tuple extends Same.ByEquality.IWrapper with CanPeek {
 
     type Static <: HList
     def static: Static

diff --git a/dev/gradle-versions.sh b/dev/gradle-versions.sh
@@ -5,6 +5,6 @@ FWDIR="$(
   pwd
 )"
 
-${FWDIR}/gradlew wrapper --gradle-version=8.5
+${FWDIR}/gradlew wrapper --gradle-version=8.6
 
 ${FWDIR}/gradlew dependencyUpdates --warning-mode all "$@"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/prover-commons b/prover-commons
diff --git a/splain b/splain
+13 −1		src/main/kotlin/Versions.kt
+1 −1		src/main/kotlin/ai.acyclic.scala-mixin.gradle.kts
+6 −1		src/main/kotlin/ai.acyclic.scala2-conventions.gradle.kts
+1 −1		core/src/main/scala-2.13.7+/latest/splain/SplainFormattingExtension.scala
+0 −23		core/src/test/resources/splain/plugin/ZIOSpec/console/code.scala
+0 −0		core/src/test/resources/splain/plugin/ZIOSpec/console/error
+0 −4		core/src/test/scala/splain/plugin/ZIOSpec.scala