Merge pull request #309 from UniFormal/master

Release 10

.gitignore

@@ -1,6 +1,8 @@
-project/project
+src/project/project
 src/project/build.properties
 
+# do not commit 
+
 # Do not accidentally commit test files
 test/*.scala
 

.travis.yml

@@ -1,5 +1,4 @@
 
-
 # +===============================================================+
 # |THIS FILE HAS BEEN AUTO-GENERATED USING `sbt genTravisYML`     |
 # |ANY CHANGES WILL BE OVERWRITTEN                                |
@@ -13,199 +12,191 @@ env:
   - ENCRYPTION_LABEL: "25a07036478c"
   - COMMIT_AUTHOR_EMAIL: "tkw01536@gmail.com"
 
-# using trusty and scala
-dist: trusty
-language: scala
+# use java, and install sbt on OS X
+language: java
+
+
+# meta -- email notification for builds
+notifications:
+  email:
+    on_success: change
+    on_failure: always
+    on_error: always
+    on_start: never
+    on_cancel: never
+
 
 # speed up cloning of the git repository
 # we only need a clone depth of '1'
 git:
   depth: 1
 
-
-
-# everything below this line is automatically generated using the configuration in src/travis.sbt
-stages: 
-  - name: build.sbt
-  - name: CodeCheck
-  - name: DeployCheck
-  - name: test
-  - name: deploy
-    if: branch = master
-jobs: 
-  include: 
-    # check that build.sbt loads
-    - stage: build.sbt
-      scala: 2.11.12
-      script: "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 exit)"
-      jdk: openjdk7
-      env: 
-        - INFO='Check that build.sbt loads'
-    - script: "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 exit)"
-      scala: 2.11.12
-      jdk: openjdk8
-      env: 
-        - INFO='Check that build.sbt loads'
-    - script: "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 exit)"
-      scala: 2.11.12
-      jdk: oraclejdk8
-      env: 
-        - INFO='Check that build.sbt loads'
-    - script: "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 exit)"
-      scala: 2.11.12
-      jdk: oraclejdk9
-      env: 
-        - INFO='Check that build.sbt loads'
-    # check that the code conforms to standards
-    - stage: CodeCheck
-      scala: 2.11.12
-      script: "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 compile)"
-      jdk: openjdk7
-      env: 
-        - INFO='Check that the code compiles'
-    - script: "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 compile)"
-      scala: 2.11.12
-      jdk: openjdk8
-      env: 
-        - INFO='Check that the code compiles'
-    - script: "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 compile)"
-      scala: 2.11.12
-      jdk: oraclejdk8
-      env: 
-        - INFO='Check that the code compiles'
-    - script: "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 compile)"
-      scala: 2.11.12
-      jdk: oraclejdk9
-      env: 
-        - INFO='Check that the code compiles'
-    - script: "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 scalastyle)"
-      scala: 2.11.12
-      jdk: openjdk7
-      env: 
-        - INFO='Print scalastyle violations'
-    - script: "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 scalastyle)"
-      scala: 2.11.12
-      jdk: openjdk8
-      env: 
-        - INFO='Print scalastyle violations'
-    - script: "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 scalastyle)"
-      scala: 2.11.12
-      jdk: oraclejdk8
-      env: 
-        - INFO='Print scalastyle violations'
-    - script: "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 scalastyle)"
-      scala: 2.11.12
-      jdk: oraclejdk9
-      env: 
-        - INFO='Print scalastyle violations'
-    # check that the 'apidoc', 'deploy' 'genTravisYML' and 'deployFull' targets work
-    - stage: DeployCheck
-      scala: 2.11.12
-      script: 'cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 deploy) && cd .. && [[ -f "deploy/mmt.jar" ]]'
-      jdk: openjdk7
-      env: 
-        - INFO='Check mmt.jar generation using `sbt deploy`'
-    - script: 'cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 deploy) && cd .. && [[ -f "deploy/mmt.jar" ]]'
-      scala: 2.11.12
+# +===============================================================+
+# |Anything below this line has been generated automatically      |
+# |from src/travis.sbt.                                           |
+# +===============================================================+
+before_install:
+  - 'if [[ "$TRAVIS_OS_NAME" = "osx" ]]; then brew update; brew install sbt; fi'
+before_script:
+  - 'if [ "$TRAVIS_BRANCH" == "devel" ]; then export TEST_USE_ARCHIVE_HEAD=1; fi'
+  - 'if [ "$TRAVIS_BRANCH" == "devel" ]; then export TEST_USE_DEVEL=1; fi'
+install:
+  - "cd src && (cat /dev/null | sbt ++2.12.3 update) && cd .."
+jobs:
+  include:
+    # check that 'sbt genTravisYML' has been run
+    - dist: trusty
+      env:
+        - "INFO='Check that `sbt genTravisYML` has been run'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: openjdk8
-      env: 
-        - INFO='Check mmt.jar generation using `sbt deploy`'
-    - script: 'cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 deploy) && cd .. && [[ -f "deploy/mmt.jar" ]]'
-      scala: 2.11.12
-      jdk: oraclejdk8
-      env: 
-        - INFO='Check mmt.jar generation using `sbt deploy`'
-    - script: 'cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 deploy) && cd .. && [[ -f "deploy/mmt.jar" ]]'
-      scala: 2.11.12
-      jdk: oraclejdk9
-      env: 
-        - INFO='Check mmt.jar generation using `sbt deploy`'
-    - script: 'cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 deployFull) && cd .. && [[ -f "deploy/mmt.jar" ]]'
-      scala: 2.11.12
-      jdk: openjdk7
-      env: 
-        - INFO='Check mmt.jar generation using `sbt deployfull`'
-    - script: 'cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 deployFull) && cd .. && [[ -f "deploy/mmt.jar" ]]'
-      scala: 2.11.12
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 genTravisYML) && cd .."
+        - '(git diff --quiet --exit-code ".travis.yml")'
+      stage: SelfCheck
+    # Check that our tests run and the code compiles
+    - dist: trusty
+      env:
+        - "INFO='Check that the code compiles and the test runs run and the code compiles'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: openjdk8
-      env: 
-        - INFO='Check mmt.jar generation using `sbt deployfull`'
-    - script: 'cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 deployFull) && cd .. && [[ -f "deploy/mmt.jar" ]]'
-      scala: 2.11.12
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 scalastyle) && cd .."
+        - "cd src && (cat /dev/null | sbt ++2.12.3 compile) && cd .."
+        - "cd src && (cat /dev/null | sbt ++2.12.3 test) && cd .."
+      stage: CompileAndCheck
+    - dist: trusty
+      env:
+        - "INFO='Check that the code compiles and the test runs run and the code compiles'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: oraclejdk8
-      env: 
-        - INFO='Check mmt.jar generation using `sbt deployfull`'
-    - script: 'cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 deployFull) && cd .. && [[ -f "deploy/mmt.jar" ]]'
-      scala: 2.11.12
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 scalastyle) && cd .."
+        - "cd src && (cat /dev/null | sbt ++2.12.3 compile) && cd .."
+        - "cd src && (cat /dev/null | sbt ++2.12.3 test) && cd .."
+    - dist: trusty
+      env:
+        - "INFO='Check that the code compiles and the test runs run and the code compiles'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: oraclejdk9
-      env: 
-        - INFO='Check mmt.jar generation using `sbt deployfull`'
-    - script: 'cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 apidoc) && cd .. && [[ -d "apidoc" ]]'
-      scala: 2.11.12
-      jdk: openjdk7
-      env: 
-        - INFO='Check that apidoc generation works'
-    - script: 'cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 apidoc) && cd .. && [[ -d "apidoc" ]]'
-      scala: 2.11.12
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 scalastyle) && cd .."
+        - "cd src && (cat /dev/null | sbt ++2.12.3 compile) && cd .."
+        - "cd src && (cat /dev/null | sbt ++2.12.3 test) && cd .."
+    # check that the 'apidoc', 'deploy' and 'deployFull' targets work
+    - dist: trusty
+      env:
+        - "INFO='Check mmt.jar generation using `sbt deploy`'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: openjdk8
-      env: 
-        - INFO='Check that apidoc generation works'
-    - script: 'cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 apidoc) && cd .. && [[ -d "apidoc" ]]'
-      scala: 2.11.12
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 deploy) && cd .."
+        - '[[ -f "deploy/mmt.jar" ]]'
+      stage: DeployCheck
+    - dist: trusty
+      env:
+        - "INFO='Check mmt.jar generation using `sbt deploy`'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: oraclejdk8
-      env: 
-        - INFO='Check that apidoc generation works'
-    - script: 'cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 apidoc) && cd .. && [[ -d "apidoc" ]]'
-      scala: 2.11.12
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 deploy) && cd .."
+        - '[[ -f "deploy/mmt.jar" ]]'
+    - dist: trusty
+      env:
+        - "INFO='Check mmt.jar generation using `sbt deploy`'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: oraclejdk9
-      env: 
-        - INFO='Check that apidoc generation works'
-    - script: 'cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 genTravisYML) && cd .. && (git diff --quiet --exit-code ".travis.yml")'
-      scala: 2.11.12
-      jdk: openjdk7
-      env: 
-        - INFO='Check that `sbt genTravisYML` has been run'
-    - script: 'cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 genTravisYML) && cd .. && (git diff --quiet --exit-code ".travis.yml")'
-      scala: 2.11.12
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 deploy) && cd .."
+        - '[[ -f "deploy/mmt.jar" ]]'
+    - dist: trusty
+      env:
+        - "INFO='Check mmt.jar generation using `sbt deployfull`'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: openjdk8
-      env: 
-        - INFO='Check that `sbt genTravisYML` has been run'
-    - script: 'cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 genTravisYML) && cd .. && (git diff --quiet --exit-code ".travis.yml")'
-      scala: 2.11.12
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 deployFull) && cd .."
+        - '[[ -f "deploy/mmt.jar" ]]'
+    - dist: trusty
+      env:
+        - "INFO='Check mmt.jar generation using `sbt deployfull`'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: oraclejdk8
-      env: 
-        - INFO='Check that `sbt genTravisYML` has been run'
-    - script: 'cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 genTravisYML) && cd .. && (git diff --quiet --exit-code ".travis.yml")'
-      scala: 2.11.12
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 deployFull) && cd .."
+        - '[[ -f "deploy/mmt.jar" ]]'
+    - dist: trusty
+      env:
+        - "INFO='Check mmt.jar generation using `sbt deployfull`'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: oraclejdk9
-      env: 
-        - INFO='Check that `sbt genTravisYML` has been run'
-    # check that our own tests work
-    - stage: test
-      scala: 2.11.12
-      script: "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 test)"
-      jdk: openjdk7
-      env: 
-        - INFO='Run MMT Tests'
-    - script: "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 test)"
-      scala: 2.11.12
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 deployFull) && cd .."
+        - '[[ -f "deploy/mmt.jar" ]]'
+    - dist: trusty
+      env:
+        - "INFO='Check that apidoc generation works'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: openjdk8
-      env: 
-        - INFO='Run MMT Tests'
-    - script: "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 test)"
-      scala: 2.11.12
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 apidoc) && cd .."
+        - '[[ -d "apidoc" ]]'
+    - dist: trusty
+      env:
+        - "INFO='Check that apidoc generation works'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: oraclejdk8
-      env: 
-        - INFO='Run MMT Tests'
-    - script: "cd src && (cat /dev/null | sbt -Dsbt.scala.version=2.10.7 test)"
-      scala: 2.11.12
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 apidoc) && cd .."
+        - '[[ -d "apidoc" ]]'
+    - dist: trusty
+      env:
+        - "INFO='Check that apidoc generation works'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: oraclejdk9
-      env: 
-        - INFO='Run MMT Tests'
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "cd src && (cat /dev/null | sbt ++2.12.3 apidoc) && cd .."
+        - '[[ -d "apidoc" ]]'
     # deploy the api documentation
-    - stage: deploy
-      scala: 2.11.12
-      script: bash scripts/travis/deploy_doc.sh
+    - dist: trusty
+      env:
+        - "INFO='Auto-deploy API documentation'"
+        - 'SBT_VERSION_CMD="^validate"'
       jdk: openjdk8
-      env: 
-        - "INFO='Auto-deploy API documentation'"
+      language: scala
+      scala: "2.12.3"
+      script:
+        - "bash scripts/travis/deploy_doc.sh"
+      stage: deploy
+stages:
+  - name: SelfCheck
+  - name: CompileAndCheck
+  - name: DeployCheck
+  - if: "branch = master"
+    name: deploy