diff --git a/appveyor.yml b/appveyor.yml index 77c4c7ee2..4a29190cd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,8 +3,8 @@ version: '{build}' os: Windows Server 2012 install: - cmd: mkdir C:\sbt - - cmd: curl -Lo C:\sbt\sbt https://github.com/coursier/sbt-launcher/releases/download/v1.2.11/csbt - - cmd: curl -Lo C:\sbt\sbt.bat https://github.com/coursier/sbt-launcher/releases/download/v1.2.11/csbt.bat + - cmd: curl -Lo C:\sbt\sbt https://github.com/coursier/sbt-launcher/releases/download/v1.2.17/csbt + - cmd: curl -Lo C:\sbt\sbt.bat https://github.com/coursier/sbt-launcher/releases/download/v1.2.17/csbt.bat - cmd: SET JAVA_HOME=C:\Program Files\Java\jdk1.8.0 - cmd: SET PATH=C:\sbt;%JAVA_HOME%\bin;%PATH% - cmd: SET JAVA_OPTS=-Xmx4g -Xss2m diff --git a/project/build.properties b/project/build.properties index c0bab0494..8522443de 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.8 +sbt.version=1.3.2 diff --git a/project/plugins.sbt b/project/plugins.sbt index 8268e23ac..638e9e21e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,9 +1,7 @@ plugins_( "com.geirsson" % "sbt-ci-release" % "1.3.2", - "io.get-coursier" % "sbt-coursier" % sbtCoursierVersion, "com.typesafe" % "sbt-mima-plugin" % "0.3.0", - "io.get-coursier" % "sbt-shading" % sbtCoursierVersion, "org.scala-sbt" % "sbt-contraband" % "0.4.4" ) @@ -11,6 +9,9 @@ libs ++= Seq( "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value ) +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "2.0.0-RC3-6") +addSbtPlugin("io.get-coursier" % "sbt-shading" % "2.0.0-RC3-6") + def plugins_(modules: ModuleID*) = modules.map(addSbtPlugin) def libs = libraryDependencies diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt deleted file mode 100644 index 30745214e..000000000 --- a/project/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("io.get-coursier" % "sbt-coursier" % "2.0.0-RC3-6")