Merge branch '1.5.x' into fix-travis-scripts-with-stages

playframework · Jan 6, 2020 · 1f09154 · 1f09154
2 parents 34d3eca + cfb7928
commit 1f09154
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -60,10 +60,10 @@ jobs:
 
 cache:
   directories:
-    - "$HOME/.coursier/cache"
-    - "$HOME/.ivy2/cache"
-    - "$HOME/.jabba/jdk"
-    - "$HOME/.sbt"
+  - "$HOME/.cache/coursier"
+  - "$HOME/.ivy2/cache"
+  - "$HOME/.jabba/jdk"
+  - "$HOME/.sbt"
 
 before_cache:
   - rm -rf $HOME/.ivy2/cache/com.typesafe.play/twirl*

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.3
+sbt.version=1.3.6