upgrade & adapt to submodules

tribbloid · Mar 17, 2024 · f253b71 · f253b71
1 parent acf228d
commit f253b71
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/buildSrc b/buildSrc
diff --git a/core/src/main/scala/shapesafe/core/SymbolicTuples.scala b/core/src/main/scala/shapesafe/core/SymbolicTuples.scala
@@ -19,7 +19,7 @@ trait SymbolicTuples[VB] extends Tuples {
   class Eye extends Backbone.Eye with Tuple {
 
     final override type _ConsExpr[T <: HasNotation] = T#Notation
-    final override type Notation = EYE.T
+    final override type Notation = EYE.type
   }
   override val Eye = new Eye
 

diff --git a/gradlew.bat b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

diff --git a/prover-commons b/prover-commons
+5 −1		src/main/kotlin/ai.acyclic.scala2-conventions.gradle.kts
+3 −0		src/main/kotlin/ai.acyclic.scala3-conventions.gradle.kts
+2 −0		module/core/src/main/scala/ai/acyclic/prover/commons/function/Impl.scala
+1 −0		module/core/src/main/scala/ai/acyclic/prover/commons/function/PreDef.scala
+10 −1		module/core/src/main/scala/ai/acyclic/prover/commons/function/api/HasPoly.scala
+2 −2		module/core/src/main/scala/ai/acyclic/prover/commons/function/api/HasPolyLike.scala
+0 −6		module/core/src/main/scala/ai/acyclic/prover/commons/function/unused/Kinds.scala
+5 −5		module/core/src/main/scala/ai/acyclic/prover/commons/tuple/ProductTuples.scala
+3 −1		module/core/src/main/scala/ai/acyclic/prover/commons/util/Capabilities.scala
+5 −1		module/meta2/src/main/scala/ai/acyclic/prover/commons/refl/package.scala
+0 −3		module/meta2/src/test/scala/ai/acyclic/prover/commons/refl/package.scala
+7 −8		module/meta2/src/test/scala/ai/acyclic/prover/commons/viz/format/FormatOvrdSpec.scala