From 0eb0da7465415ffea05863038e9f06a0f7596c4a Mon Sep 17 00:00:00 2001 From: JanBessai Date: Wed, 8 Jan 2020 15:44:15 +0100 Subject: [PATCH 1/4] Push jdk version for travis --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 && From 7164511bbfcf2b8e0f5565951224d599d28040f0 Mon Sep 17 00:00:00 2001 From: JanBessai Date: Thu, 22 Feb 2018 16:44:03 +0100 Subject: [PATCH 2/4] Push dependencies --- build.sbt | 11 +++-------- project/build.properties | 2 +- project/plugins.sbt | 6 +++--- .../org/combinators/cls/git/overview.scala.html | 4 ++-- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/build.sbt b/build.sbt index 8ca0ba9..6d1bf59 100644 --- a/build.sbt +++ b/build.sbt @@ -37,8 +37,8 @@ lazy val root = (Project(id = "cls-scala-presentation-play-git", base = file("." "org.combinators" %% "cls-scala" % "2.0.0-RC1", "org.combinators" %% "templating" % "1.0.0-RC1", "org.scalatestplus.play" %% "scalatestplus-play" % "3.1.2" % "test", - "org.eclipse.jgit" % "org.eclipse.jgit" % "4.9.0.201710071750-r", - "org.webjars" %% "webjars-play" % "2.6.1", + "org.eclipse.jgit" % "org.eclipse.jgit" % "4.10.0.201712302008-r", + "org.webjars" %% "webjars-play" % "2.6.3", "org.webjars" % "bootstrap" % "3.3.7-1", "commons-io" % "commons-io" % "2.6" ), @@ -74,9 +74,4 @@ lazy val noPublishSettings = Seq( publish := Seq.empty, publishLocal := Seq.empty, publishArtifact := false -) - -credentials in ThisBuild ++= (for { - username <- Option(System.getenv().get("SONATYPE_USERNAME")) - password <- Option(System.getenv().get("SONATYPE_PASSWORD")) -} yield Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", username, password)).toSeq +) \ No newline at end of file diff --git a/project/build.properties b/project/build.properties index 394cb75..31334bb 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.0.4 +sbt.version=1.1.1 diff --git a/project/plugins.sbt b/project/plugins.sbt index 878a9f8..84a2979 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1") addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.2") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0") -addSbtPlugin("ch.epfl.scala" % "sbt-release-early" % "2.0.1") -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.9") -addSbtPlugin("de.heikoseeberger" % "sbt-header" % "4.0.0") +addSbtPlugin("ch.epfl.scala" % "sbt-release-early" % "2.1.1") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.11") +addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.0.0") 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..fb94c8b 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)