Skip to content

Commit

Permalink
Move crossbuilding and crosspublishing from Travis to sbt.
Browse files Browse the repository at this point in the history
Fix small bug in bash script.
Fix junit dependency.
  • Loading branch information
Joachim Hofer committed Sep 28, 2014
1 parent c1f0f21 commit 78b94d1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
language: scala
scala:
- 2.10.4
- 2.11.2
jdk:
- oraclejdk7
script:
- sbt +test
after_success:
- ./publishViaTravis.sh
env:
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ crossScalaVersions := Seq("2.10.4", "2.11.2")
libraryDependencies ++= Seq(
"io.reactivex" % "rxjava" % "1.0.0-rc.3",
"org.mockito" % "mockito-core" % "1.9.5" % "test",
"junit" % "junit-dep" % "4.11" % "test",
"junit" % "junit" % "4.11" % "test",
"org.scalatest" %% "scalatest" % "2.2.2" % "test")
4 changes: 2 additions & 2 deletions publishViaTravis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then

sbt storeBintrayCredentials

sbt ++$TRAVIS_SCALA_VERSION publishSigned
# RETVAL=$?
sbt +publishSigned
RETVAL=$?

if [ $RETVAL -eq 0 ]; then
echo 'Completed upload!'
Expand Down

0 comments on commit 78b94d1

Please sign in to comment.