Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ script: sbt +test

jobs:
include:
- stage: test
- dist: trusty
stage: test
jdk: oraclejdk8
- stage: test
jdk: openjdk8
jdk: openjdk11
script: sbt clean coverage +test && sbt coverageReport coveralls
- stage: deploy
jdk: openjdk8
jdk: openjdk11
script: |
openssl aes-256-cbc -K $encrypted_50e7e43ad6db_key -iv $encrypted_50e7e43ad6db_iv -in travis/secrets.tar.enc -out travis/local.secrets.tar -d &&
tar xv -C travis -f travis/local.secrets.tar &&
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import play.twirl.sbt.Import.TwirlKeys
lazy val commonSettings = Seq(
organization := "org.combinators",

scalaVersion := "2.12.4",
scalaVersion := "2.12.10",
crossScalaVersions := Seq("2.11.12", scalaVersion.value),

resolvers ++= Seq(
Expand Down Expand Up @@ -74,4 +74,4 @@ lazy val noPublishSettings = Seq(
publish := Seq.empty,
publishLocal := Seq.empty,
publishArtifact := false
)
)
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@

<title>Inhabitation</title>
<!-- Bootstrap core CSS -->
@Html(webJars.css("css/bootstrap.min.css"))
@Html(webJars.requireJs(routes.Assets.at("ui_init.js")))
@Html(webJars.locate("css/bootstrap.min.css").css().body)
@Html(webJars.requireJs(routes.Assets.at("ui_init.js")).body)
<style>
.glyphicon-refresh-animate {
-animation: spin .7s infinite linear;
Expand Down Expand Up @@ -88,7 +88,7 @@ <h4>Infinite results, truncated to the smallest 100 Raw-Terms, offending request
@Html(targets.collect { case (ty, None) => s"&Gamma; &vdash; ? : ${ty.toString}" }.mkString("\n"))
</pre>
</div>
} else {
}
@for(i <- 0 to (if (infinite) 100 else rawTerms.values.flatMap(_._2).size - 1)) {
<nav class="navbar navbar-default">
<div class="container-fluid">
Expand All @@ -111,7 +111,6 @@ <h4>Infinite results, truncated to the smallest 100 Raw-Terms, offending request
</div>
</nav>
}
}
<h3>Repository:</h3>
<pre>
&Gamma; = {
Expand All @@ -121,4 +120,4 @@ <h3>Repository:</h3>
}
</pre>
</body>
</html>
</html>