Merge 54a26de into 9e7d57c

lloydmeta · Dec 31, 2019 · af70c18 · af70c18
2 parents 9e7d57c + 54a26de
commit af70c18
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ matrix:
       script:
         - sbt -jvm-opts .travis-jvmopts ++$TRAVIS_SCALA_VERSION  test:compile test:doc
         - travis_wait 30 sleep 1800 &
-        - sbt -jvm-opts .travis-jvmopts ++$TRAVIS_SCALA_VERSION test
+        - travis_retry sbt -jvm-opts .travis-jvmopts ++$TRAVIS_SCALA_VERSION test
     - scala: 2.11.12
       jdk: openjdk8
       script:

diff --git a/build.sbt b/build.sbt
@@ -508,7 +508,7 @@ lazy val commonWithPublishSettings =
 
 lazy val resolverSettings = Seq(
   resolvers ++= Seq(
-    "Typesafe Releases" at "http://repo.typesafe.com/typesafe/releases/",
+    "Typesafe Releases" at "https://repo.typesafe.com/typesafe/releases/",
     "Sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
     "Sonatype releases" at "https://oss.sonatype.org/content/repositories/releases"
   )

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