Skip to content

Commit dfd254a

Browse files
authored
Merge pull request #39 from cquiroz/build-improvements
Build improvements
2 parents d1bb0de + f75a0e1 commit dfd254a

File tree

2 files changed

+22
-12
lines changed

2 files changed

+22
-12
lines changed

.travis.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,14 @@ scala:
1919
before_install:
2020
- export PATH=${PATH}:./vendor/bundle
2121

22+
env:
23+
- TRAVIS_NODE_VERSION="5.12.0"
24+
- TRAVIS_NODE_VERSION="6.10.0"
25+
- TRAVIS_NODE_VERSION="7.6.0"
26+
2227
install:
28+
- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
29+
- npm install
2330
- rvm use 2.2.3 --install --fuzzy
2431
- gem update --system
2532
- gem install sass
@@ -30,15 +37,13 @@ cache:
3037
- $HOME/.ivy2
3138
- $HOME/.m2
3239
- $HOME/.coursier
33-
34-
env:
35-
- COURSIER_NO_TERM=1
40+
- $HOME/.sbt/boot
3641

3742
script:
3843
- sbt ++$TRAVIS_SCALA_VERSION clean scalajavatimeJVM/test
3944
- sbt ++$TRAVIS_SCALA_VERSION clean scalajavatimeJS/test
4045
- sbt docs/makeMicrosite
41-
#- sbt clean coverage test &&
42-
# sbt coverageAggregate
43-
after_success:
44-
#- sbt coveralls
46+
# Tricks to avoid unnecessary cache updates, from
47+
# http://www.scala-sbt.org/0.13/docs/Travis-CI-with-sbt.html
48+
- find $HOME/.sbt -name "*.lock" | xargs rm
49+
- find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm

build.sbt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,18 @@ lazy val commonSettings = Seq(
2222
crossScalaVersions := crossScalaVer,
2323
autoAPIMappings := true,
2424

25-
scalacOptions in Compile ++= Seq(
26-
"-deprecation",
27-
"-feature",
28-
// Enable when documentation does not produce warnings
29-
//"-Xfatal-warnings",
25+
scalacOptions ++= Seq("-deprecation", "-feature",
3026
"-encoding", "UTF-8"
3127
),
28+
scalacOptions := {
29+
CrossVersion.partialVersion(scalaVersion.value) match {
30+
case Some((2, scalaMajor)) if scalaMajor >= 11 =>
31+
scalacOptions.value ++ Seq("-deprecation:false", "-Xfatal-warnings")
32+
case Some((2, 10)) =>
33+
scalacOptions.value
34+
}
35+
},
36+
javaOptions ++= Seq("-Dfile.encoding=UTF8"),
3237

3338
publishArtifact in Test := false,
3439
publishMavenStyle := true,

0 commit comments

Comments
 (0)