Skip to content

Commit 922cee7

Browse files
committed
cross-build with 2.11 and 2.12
1 parent c9a797c commit 922cee7

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

admin/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if [ "$TRAVIS_JDK_VERSION" == "$PUBLISH_JDK" ] && [[ "$TRAVIS_TAG" =~ ^v[0-9]+\.
1111
echo "Going to release from tag $TRAVIS_TAG!"
1212
myVer=$(echo $TRAVIS_TAG | sed -e s/^v//)
1313
publishVersion='set every version := "'$myVer'"'
14-
extraTarget="publish-signed"
14+
extraTarget="+publish-signed"
1515
cat admin/gpg.sbt >> project/plugins.sbt
1616
cp admin/publish-settings.sbt .
1717

@@ -22,4 +22,4 @@ if [ "$TRAVIS_JDK_VERSION" == "$PUBLISH_JDK" ] && [[ "$TRAVIS_TAG" =~ ^v[0-9]+\.
2222
openssl aes-256-cbc -K $K -iv $IV -in admin/secring.asc.enc -out admin/secring.asc -d
2323
fi
2424

25-
sbt "$publishVersion" clean update test publishLocal $extraTarget
25+
sbt "$publishVersion" clean update +test +publishLocal $extraTarget

build.sbt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ name := "scala-partest"
66

77
version := "1.0.8-SNAPSHOT"
88

9-
scalaVersion := "2.11.6"
9+
scalaVersion := crossScalaVersions.value.head
1010

11-
scalaXmlVersion := "1.0.3"
11+
crossScalaVersions := Seq("2.11.6", "2.12.0-M1")
1212

13-
scalaCheckVersion := "1.11.3"
13+
scalaXmlVersion := "1.0.4"
14+
15+
scalaCheckVersion := "1.11.6"
1416

1517
// TODO: enable "-Xfatal-warnings" for nightlies,
1618
// off by default because we don't want to break scala/scala pr validation due to deprecation

0 commit comments

Comments
 (0)