Merge pull request #535 from UniFormal/devel

Devel
UniFormal · Sep 22, 2020 · 514b7a6 · 514b7a6
2 parents bde512a + 2690759
commit 514b7a6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/build.sbt b/src/build.sbt
@@ -152,7 +152,7 @@ lazy val src = (project in file(".")).
   exclusions(excludedProjects).
   aggregatesAndDepends(
     mmt, api,
-    lf, concepts, tptp, owl, mizar, frameit, mathscheme, pvs, metamath, tps, imps, isabelle, odk, specware, stex, mathhub, planetary, interviews, latex, openmath, oeis, repl, got, coq, glf,
+    lf, concepts, tptp, owl, mizar, frameit, mathscheme, pvs, tps, imps, isabelle, odk, specware, stex, mathhub, planetary, interviews, latex, openmath, oeis, repl, got, coq, glf,
     tiscaf, lfcatalog,
     jedit, intellij, argsemcomp
   ).
@@ -425,10 +425,10 @@ lazy val pvs = (project in file("mmt-pvs")).
   settings(mmtProjectsSettings("mmt-pvs"): _*)
 
 // plugin for reading metamath
-lazy val mmscala = RootProject(uri("https://github.com/UniFormal/mm-scala#master"))
+/*lazy val mmscala = RootProject(uri("https://github.com/UniFormal/mm-scala#master"))
 lazy val metamath = (project in file("mmt-metamath")).
   dependsOn(api, lf, mmscala).
-  settings(mmtProjectsSettings("mmt-metamath"): _*)
+  settings(mmtProjectsSettings("mmt-metamath"): _*) */
 
 // plugin for reading isabelle. Author: Makarius Wenzel
 // This only works if an Isabelle environment is present. If not, we use an empty dummy project.

diff --git a/src/mmt-odk/src/info/kwarc/mmt/odk/ODKTest.scala b/src/mmt-odk/src/info/kwarc/mmt/odk/ODKTest.scala
@@ -64,11 +64,11 @@ object LATIN2Test extends MMTIntegrationTest(
   ExtensionSpec("info.kwarc.mmt.odk.Plugin")
 ){
   def main(): Unit = {
-    shouldClearTarget("MMT/urtheories", "bin")
-    shouldHandleLine("build MMT/urtheories scala-bin")
+    //shouldClearTarget("MMT/urtheories", "bin")
+    //shouldHandleLine("build MMT/urtheories scala-bin")
 
-    shouldClearTarget("MMT/LFX", "bin")
-    shouldHandleLine("build MMT/LFX scala-bin")
+    //shouldClearTarget("MMT/LFX", "bin")
+    //shouldHandleLine("build MMT/LFX scala-bin")
 
     shouldClearTarget("MMT/LATIN2", "bin")
     shouldHandleLine("build MMT/LATIN2 scala-bin")

diff --git a/src/project/build.properties b/src/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.3
+sbt.version=1.3.13