Skip to content

Commit

Permalink
Merge pull request #506 from UniFormal/master
Browse files Browse the repository at this point in the history
Release 19
  • Loading branch information
Jazzpirate authored Dec 13, 2019
2 parents 94b5897 + d066128 commit 1c61825
Show file tree
Hide file tree
Showing 110 changed files with 5,186 additions and 2,718 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,7 @@ target

# scala-bin compilation articfacts
out/
*/.DS_Store

# Artifact of https://github.com/coursier/coursier when working with IntelliJ
src/null
4 changes: 3 additions & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
The MMT documentation for both developers and users can be found and edited at https://uniformal.github.io/
The MMT documentation for both developers and users as well as can be found and edited at https://uniformal.github.io/.

Acknoledgements are at https://uniformal.github.io/doc/
13 changes: 4 additions & 9 deletions src/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ lazy val mmtMainClass = "info.kwarc.mmt.api.frontend.Run"
// =================================
// GLOBAL SETTINGS
// =================================
scalaVersion in Global := "2.12.8"
scalaVersion in Global := "2.12.9"
scalacOptions in Global := Seq(
"-feature", "-language:postfixOps", "-language:implicitConversions", "-deprecation",
"-Xmax-classfile-name", "128", // fix long classnames on weird filesystems
Expand Down Expand Up @@ -145,7 +145,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, gf,
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,
tiscaf, lfcatalog,
jedit, intellij, argsemcomp
).
Expand All @@ -160,7 +160,7 @@ lazy val src = (project in file(".")).
// This is the main project. 'mmt/deploy' compiles all relevants subprojects, builds a self-contained jar file, and puts into the deploy folder, from where it can be run.
lazy val mmt = (project in file("mmt")).
exclusions(excludedProjects).
dependsOn(tptp, stex, pvs, specware, oeis, odk, jedit, latex, openmath, imps, isabelle, repl, concepts, interviews, mathhub, python, intellij, coq, glf, lsp, gf).
dependsOn(tptp, stex, pvs, specware, oeis, odk, jedit, latex, openmath, imps, isabelle, repl, concepts, interviews, mathhub, python, intellij, coq, glf, lsp).
settings(mmtProjectsSettings("mmt"): _*).
settings(
exportJars := false,
Expand Down Expand Up @@ -291,16 +291,11 @@ lazy val webEdit = (project in file("mmt-webEdit")).
settings(mmtProjectsSettings("mmt-webEdit"): _*)
*/

// Glf server. Maintainer: Frederik
// GLF (Grammatical Framework etc.). Maintainer: Frederik
lazy val glf = (project in file("mmt-glf")).
dependsOn(api, lf, repl).
settings(mmtProjectsSettings("mmt-glf"): _*)

// plugin for reading GF. Maintainer: Frederik
lazy val gf = (project in file("mmt-gf")).
dependsOn(api, lf).
settings(mmtProjectsSettings("mmt-gf"): _*)

// MMT in the interview server. Maintainer: Teresa
lazy val interviews = (project in file("mmt-interviews")).
dependsOn(api, lf).
Expand Down
Loading

0 comments on commit 1c61825

Please sign in to comment.