diff --git a/.travis.yml b/.travis.yml index 09cf89cd8..c7d814a1c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,9 @@ jdk: openjdk8 git: depth: false # https://stackoverflow.com/a/51727114/3714539 before_install: - - mkdir .bin && curl -Lo .bin/sbt https://raw.githubusercontent.com/paulp/sbt-extras/a56bf05b1113e251aeaf7542f48c45c6c2691d4d/sbt + - mkdir .bin + - curl -Lo .bin/sbt https://raw.githubusercontent.com/coursier/sbt-extras/77c93346a2b52cf35cc72382125cfdbb25a00197/sbt + - chmod +x .bin/sbt - export PATH="$(pwd)/.bin:$PATH" - export TRAVIS_SCALA_VERSION=2.12.8 script: scripts/travis.sh diff --git a/appveyor.yml b/appveyor.yml index 1aed4d288..d375ef29c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,18 +2,12 @@ version: '{build}' os: Windows Server 2012 install: - - ps: | - Add-Type -AssemblyName System.IO.Compression.FileSystem - if (!(Test-Path -Path "C:\sbt" )) { - (new-object System.Net.WebClient).DownloadFile( - 'https://dl.bintray.com/sbt/native-packages/sbt/0.13.8/sbt-0.13.8.zip', - 'C:\sbt-bin.zip' - ) - [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\sbt-bin.zip", "C:\sbt") - } + - cmd: mkdir C:\sbt + - cmd: curl -Lo C:\sbt\sbt https://github.com/coursier/sbt-launcher/releases/download/v1.2.5/csbt + - cmd: curl -Lo C:\sbt\sbt.bat https://github.com/coursier/sbt-launcher/releases/download/v1.2.5/csbt.bat - cmd: SET JAVA_HOME=C:\Program Files\Java\jdk1.8.0 - - cmd: SET PATH=C:\sbt\sbt\bin;%JAVA_HOME%\bin;%PATH% - - cmd: SET SBT_OPTS=-Xmx4g -Xss2m + - cmd: SET PATH=C:\sbt;%JAVA_HOME%\bin;%PATH% + - cmd: SET JAVA_OPTS=-Xmx4g -Xss2m - git submodule update --init --recursive environment: TEST_REPOSITORY_HOST: localhost diff --git a/project/Settings.scala b/project/Settings.scala index a06e76ca3..b870c5c7f 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -42,7 +42,8 @@ object Settings { "-Xmx1024M", "-Dplugin.name=" + name.value, "-Dplugin.version=" + version.value, - "-Dsbttest.base=" + (sourceDirectory.value / "sbt-test").getAbsolutePath + "-Dsbttest.base=" + (sourceDirectory.value / "sbt-test").getAbsolutePath, + "-Dcoursier.sbt-launcher.add-plugin=false" ), scriptedBufferLog := false, sbtPlugin := true,