From f4c82ece40080ae78f98c1d0eb15c47b6a3b4600 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Wed, 30 Dec 2015 01:34:45 +0100 Subject: [PATCH] Switch to case-app 1.0.0-M1-SNAPSHOT, disable cli build in 2.10 --- build.sbt | 4 ++-- project/travis.sh | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 26e97d72a..ff9e10dc6 100644 --- a/build.sbt +++ b/build.sbt @@ -64,7 +64,6 @@ lazy val baseCommonSettings = Seq( lazy val commonSettings = baseCommonSettings ++ Seq( scalaVersion := "2.11.7", - crossScalaVersions := Seq("2.10.6", "2.11.7"), libraryDependencies ++= { if (scalaVersion.value startsWith "2.10.") Seq(compilerPlugin("org.scalamacros" % "paradise" % "2.0.1" cross CrossVersion.full)) @@ -168,7 +167,8 @@ lazy val cli = project .settings( name := "coursier-cli", libraryDependencies ++= Seq( - "com.github.alexarchambault" %% "case-app" % "1.0.0-SNAPSHOT", + // beware - available only in 2.11 + "com.github.alexarchambault" %% "case-app" % "1.0.0-M1-SNAPSHOT", "ch.qos.logback" % "logback-classic" % "1.1.3" ), resourceGenerators in Compile += packageBin.in(bootstrap).in(Compile).map { jar => diff --git a/project/travis.sh b/project/travis.sh index 25fddad7d..32116325c 100755 --- a/project/travis.sh +++ b/project/travis.sh @@ -29,8 +29,10 @@ function isMasterOrDevelop() { # web sub-project doesn't compile in 2.10 (no scalajs-react) if echo "$TRAVIS_SCALA_VERSION" | grep -q "^2\.10"; then + IS_210=1 SBT_COMMANDS="cli/compile" else + IS_210=0 SBT_COMMANDS="compile" fi @@ -43,7 +45,12 @@ SBT_COMMANDS="$SBT_COMMANDS test" PUSH_GHPAGES=0 if isNotPr && publish && isMaster; then - SBT_COMMANDS="$SBT_COMMANDS coreJVM/publish coreJS/publish files/publish cli/publish" + SBT_COMMANDS="$SBT_COMMANDS coreJVM/publish coreJS/publish files/publish" + if [ "$IS_210" = 1 ]; then + SBT_COMMANDS="$SBT_COMMANDS plugin/publish" + else + SBT_COMMANDS="$SBT_COMMANDS cli/publish" + fi fi if isNotPr && publish && isMasterOrDevelop; then