From 6ba173a516b5624b0916958ec282a0f99c6849cc Mon Sep 17 00:00:00 2001 From: exoego Date: Wed, 8 May 2019 16:23:13 +0900 Subject: [PATCH 1/3] Update sbt --- .travis.yml | 2 +- project/build.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f02204d33..f9fca121b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ addons: - sourceline: 'deb https://dl.bintray.com/sbt/debian /' - key_url: 'https://bintray.com/user/downloadSubjectPublicKey?username=sbt' packages: - - sbt=1.1.6 + - sbt=1.2.8 # Undo _JAVA_OPTIONS environment variable before_script: diff --git a/project/build.properties b/project/build.properties index cec4f6083..c0bab0494 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.0-M1 +sbt.version=1.2.8 From b9bc4e3825dc3c161c666aed7de69478a665f313 Mon Sep 17 00:00:00 2001 From: exoego Date: Wed, 8 May 2019 16:41:34 +0900 Subject: [PATCH 2/3] Use Scala image since apt fails randomly --- .travis.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index f9fca121b..29f99fef8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ dist: trusty group: stable -language: ruby +language: scala jdk: oraclejdk8 before_script: @@ -9,14 +9,6 @@ before_script: script: /usr/bin/sbt scripted -addons: - apt: - sources: - - sourceline: 'deb https://dl.bintray.com/sbt/debian /' - - key_url: 'https://bintray.com/user/downloadSubjectPublicKey?username=sbt' - packages: - - sbt=1.2.8 - # Undo _JAVA_OPTIONS environment variable before_script: - unset _JAVA_OPTIONS From 45f78d42124d60c0d877e9e28de330fd0df97f33 Mon Sep 17 00:00:00 2001 From: exoego Date: Wed, 8 May 2019 16:44:00 +0900 Subject: [PATCH 3/3] Update sbt path --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 29f99fef8..931040e4c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ jdk: oraclejdk8 before_script: - export JVM_OPTS="-Dfile.encoding=UTF-8 -Xmx1G -Xms1G -server -XX:ReservedCodeCacheSize=128M" -script: /usr/bin/sbt scripted +script: sbt scripted # Undo _JAVA_OPTIONS environment variable before_script: