Skip to content

Commit 78b94d1

Browse files
author
Joachim Hofer
committed
Move crossbuilding and crosspublishing from Travis to sbt.
Fix small bug in bash script. Fix junit dependency.
1 parent c1f0f21 commit 78b94d1

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

.travis.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
language: scala
2-
scala:
3-
- 2.10.4
4-
- 2.11.2
52
jdk:
63
- oraclejdk7
4+
script:
5+
- sbt +test
76
after_success:
87
- ./publishViaTravis.sh
98
env:

build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ crossScalaVersions := Seq("2.10.4", "2.11.2")
1515
libraryDependencies ++= Seq(
1616
"io.reactivex" % "rxjava" % "1.0.0-rc.3",
1717
"org.mockito" % "mockito-core" % "1.9.5" % "test",
18-
"junit" % "junit-dep" % "4.11" % "test",
18+
"junit" % "junit" % "4.11" % "test",
1919
"org.scalatest" %% "scalatest" % "2.2.2" % "test")

publishViaTravis.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
88

99
sbt storeBintrayCredentials
1010

11-
sbt ++$TRAVIS_SCALA_VERSION publishSigned
12-
# RETVAL=$?
11+
sbt +publishSigned
12+
RETVAL=$?
1313

1414
if [ $RETVAL -eq 0 ]; then
1515
echo 'Completed upload!'

0 commit comments

Comments
 (0)