diff --git a/.travis.yml b/.travis.yml index 4859313..957a44f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 && diff --git a/build.sbt b/build.sbt index 6d1bf59..166f0ae 100644 --- a/build.sbt +++ b/build.sbt @@ -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( @@ -74,4 +74,4 @@ lazy val noPublishSettings = Seq( publish := Seq.empty, publishLocal := Seq.empty, publishArtifact := false -) \ No newline at end of file +) diff --git a/src/main/html-templates/org/combinators/cls/git/overview.scala.html b/src/main/html-templates/org/combinators/cls/git/overview.scala.html index 72552bb..1c5653a 100644 --- a/src/main/html-templates/org/combinators/cls/git/overview.scala.html +++ b/src/main/html-templates/org/combinators/cls/git/overview.scala.html @@ -38,8 +38,8 @@ Inhabitation - @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)