Skip to content

Commit 8ea1bcc

Browse files
authored
Merge pull request #42 from cquiroz/travis_publication
Improvements to publication and attempts to make the travis build faster
2 parents 1d266e8 + ce41bde commit 8ea1bcc

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

.travis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@ cache:
4040
- $HOME/.sbt/boot
4141

4242
script:
43-
- sbt ++$TRAVIS_SCALA_VERSION clean scalajavatimeJVM/test
44-
- sbt ++$TRAVIS_SCALA_VERSION clean scalajavatimeJS/test
45-
- sbt docs/makeMicrosite
43+
- sbt ++$TRAVIS_SCALA_VERSION clean scalajavatimeJVM/test scalajavatimeJS/test scalajavatimeJVM/publishLocal scalajavatimeJS/publishLocal docs/makeMicrosite
4644
# Tricks to avoid unnecessary cache updates, from
4745
# http://www.scala-sbt.org/0.13/docs/Travis-CI-with-sbt.html
4846
- find $HOME/.sbt -name "*.lock" | xargs rm

build.sbt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,16 @@ lazy val commonSettings = Seq(
3333
scalacOptions.value
3434
}
3535
},
36-
javaOptions ++= Seq("-Dfile.encoding=UTF8"),
36+
scalacOptions in (Compile, doc) := {
37+
CrossVersion.partialVersion(scalaVersion.value) match {
38+
case Some((2, scalaMajor)) if scalaMajor >= 11 =>
39+
Seq("-deprecation:false")
40+
case Some((2, 10)) =>
41+
Seq.empty
42+
}
43+
},
44+
javaOptions ++= Seq("-Dfile.encoding=UTF8"),
45+
autoAPIMappings := true,
3746

3847
publishArtifact in Test := false,
3948
publishMavenStyle := true,

0 commit comments

Comments
 (0)