Skip to content

Commit d4a2457

Browse files
committed
test cross build
1 parent 829903b commit d4a2457

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

.travis.yml

-3
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,8 @@ env:
77
# this environment variable is encrypted with this repo's private key and stored below:
88
# (See http://docs.travis-ci.com/user/environment-variables/#Secure-Variables.)
99
- secure: "whJQqI/7G+kUJoCCGQYbv3Y/T2Cx3EcBKfCyvMkZaVgo0wFEOUguh8I+4QqRyf9cC/uPmzwCzV9uwXsNDMcY78jouY05A+fCEnUol/9TuF5PWmXF6Yr/UmmYoCQe4pioXsbXa4uOy18kLzE0h2sOIrJ5A9NL8/58iVgl4E3pwvk="
10-
1110
script:
1211
- admin/build.sh
13-
scala:
14-
- 2.11.4
1512
jdk:
1613
- openjdk6
1714
- openjdk7

admin/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ if [ "$TRAVIS_JDK_VERSION" == "$PUBLISH_JDK" ] && [[ "$TRAVIS_TAG" =~ ^v[0-9]+\.
99
echo "Going to release from tag $TRAVIS_TAG!"
1010
myVer=$(echo $TRAVIS_TAG | sed -e s/^v//)
1111
publishVersion='set every version := "'$myVer'"'
12-
extraTarget="publish-signed"
12+
extraTarget="+publish-signed"
1313

1414
cat admin/gpg.sbt >> project/plugins.sbt
1515
admin/decrypt.sh sensitive.sbt
1616
(cd admin/ && ./decrypt.sh secring.asc)
1717
fi
1818

19-
sbt ++$TRAVIS_SCALA_VERSION "$publishVersion" clean update compile test $extraTarget
19+
sbt "$publishVersion" clean update +test $extraTarget

build.sbt

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ name := "scala-xml"
66

77
version := "1.0.5-SNAPSHOT"
88

9-
scalaVersion := "2.11.4"
9+
scalaVersion := crossScalaVersions.value.head
10+
11+
crossScalaVersions := Seq("2.11.6", "2.12.0-M1")
1012

1113
// important!! must come here (why?)
1214
scalaModuleOsgiSettings

0 commit comments

Comments
 (0)