From e34a25c1d44fb6da8e8789d04d3d8953fe9fcea0 Mon Sep 17 00:00:00 2001 From: Joan Goyeau Date: Wed, 14 Feb 2018 17:34:15 +0000 Subject: [PATCH] SBT 1.1.1 --- .travis.yml | 2 +- build.sbt | 9 ++++----- project/build.properties | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 98af4916e..f0bb17b12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,7 @@ matrix: env: SBT_TEST_CMD="^validateDocker" # workaround for https://github.com/travis-ci/travis-ci/issues/4527 before_script: - - curl -L --create-dirs -o $HOME/.sbt/launchers/1.0.2/sbt-launch.jar http://dl.bintray.com/sbt/maven-releases/org/scala-sbt/sbt-launch/1.0.2/sbt-launch.jar + - curl -L --create-dirs -o $HOME/.sbt/launchers/1.1.1/sbt-launch.jar http://dl.bintray.com/sbt/maven-releases/org/scala-sbt/sbt-launch/1.1.1/sbt-launch.jar addons: apt: diff --git a/build.sbt b/build.sbt index a187810eb..c26def998 100644 --- a/build.sbt +++ b/build.sbt @@ -3,12 +3,12 @@ sbtPlugin := true name := "sbt-native-packager" organization := "com.typesafe.sbt" -scalaVersion in Global := "2.12.4" +Global / scalaVersion := "2.12.5" // crossBuildingSettings -crossSbtVersions := Vector("0.13.16", "1.0.0") +crossSbtVersions := Vector("0.13.17", "1.1.1") -scalacOptions in Compile ++= Seq("-deprecation") +Compile / scalacOptions ++= Seq("-deprecation") javacOptions ++= Seq("-source", "1.8", "-target", "1.8") // put jdeb on the classpath for scripted tests @@ -22,7 +22,7 @@ libraryDependencies ++= Seq( // sbt dependend libraries libraryDependencies ++= { - (sbtVersion in pluginCrossBuild).value match { + (pluginCrossBuild / sbtVersion).value match { case v if v.startsWith("1.") => Seq( "org.scala-sbt" %% "io" % "1.0.0", @@ -50,7 +50,6 @@ libraryDependencies ++= { "org.scala-lang.modules" %% "scala-xml" % "1.0.6" ) } - } // configure github page diff --git a/project/build.properties b/project/build.properties index b7dd3cb2a..31334bbd3 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.0.2 +sbt.version=1.1.1