luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch to case-app 1.0.0-M1-SNAPSHOT, disable cli build in 2.10

This commit is contained in:
Alexandre Archambault 2015-12-30 01:34:45 +01:00
parent 6a460c1fb2
commit f4c82ece40
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sbt
View File

@ -64,7 +64,6 @@ lazy val baseCommonSettings = Seq(
lazy val commonSettings = baseCommonSettings ++ Seq( lazy val commonSettings = baseCommonSettings ++ Seq(
scalaVersion := "2.11.7", scalaVersion := "2.11.7",
crossScalaVersions := Seq("2.10.6", "2.11.7"),
libraryDependencies ++= { libraryDependencies ++= {
if (scalaVersion.value startsWith "2.10.") if (scalaVersion.value startsWith "2.10.")
Seq(compilerPlugin("org.scalamacros" % "paradise" % "2.0.1" cross CrossVersion.full)) Seq(compilerPlugin("org.scalamacros" % "paradise" % "2.0.1" cross CrossVersion.full))
@ -168,7 +167,8 @@ lazy val cli = project
.settings( .settings(
name := "coursier-cli", name := "coursier-cli",
libraryDependencies ++= Seq( 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" "ch.qos.logback" % "logback-classic" % "1.1.3"
), ),
resourceGenerators in Compile += packageBin.in(bootstrap).in(Compile).map { jar => resourceGenerators in Compile += packageBin.in(bootstrap).in(Compile).map { jar =>

9
project/travis.sh
View File

@ -29,8 +29,10 @@ function isMasterOrDevelop() {
# web sub-project doesn't compile in 2.10 (no scalajs-react) # web sub-project doesn't compile in 2.10 (no scalajs-react)
if echo "$TRAVIS_SCALA_VERSION" | grep -q "^2\.10"; then if echo "$TRAVIS_SCALA_VERSION" | grep -q "^2\.10"; then
IS_210=1
SBT_COMMANDS="cli/compile" SBT_COMMANDS="cli/compile"
else else
IS_210=0
SBT_COMMANDS="compile" SBT_COMMANDS="compile"
fi fi
@ -43,7 +45,12 @@ SBT_COMMANDS="$SBT_COMMANDS test"
PUSH_GHPAGES=0 PUSH_GHPAGES=0
if isNotPr && publish && isMaster; then 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 fi
if isNotPr && publish && isMasterOrDevelop; then if isNotPr && publish && isMasterOrDevelop; then