aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Warski <adam@warski.org>2018-05-11 12:56:39 +0200
committerGitHub <noreply@github.com>2018-05-11 12:56:39 +0200
commit2f836bd5347a5f26edb80fc6e2c5a2b9c458f64d (patch)
tree1075ee23cc4b7e5019fcd7c277371e3cbf13a0b2
parent04829943af375b4fd8248ba4fd1b3445af078b92 (diff)
parent8cf2a1ed55d02fedc49b5badcc41fd092d34bf9d (diff)
downloadsttp-2f836bd5347a5f26edb80fc6e2c5a2b9c458f64d.tar.gz
sttp-2f836bd5347a5f26edb80fc6e2c5a2b9c458f64d.tar.bz2
sttp-2f836bd5347a5f26edb80fc6e2c5a2b9c458f64d.zip
Merge pull request #89 from rider-yi/update_dependencies
Update dependencies
-rw-r--r--.travis.yml4
-rw-r--r--project/build.properties2
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 256807b..354f279 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,8 @@ language: scala
jdk:
- oraclejdk8
scala:
-- 2.12.4
-- 2.11.11
+- 2.12.6
+- 2.11.12
script:
- sbt ++$TRAVIS_SCALA_VERSION test
- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && sbt updateImpactSubmit || true'
diff --git a/project/build.properties b/project/build.properties
index 40577b0..8b2d2fb 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.1.2 \ No newline at end of file
+sbt.version=1.1.5 \ No newline at end of file