Skip to content

Commit acb60c6

Browse files
committed
cross-build with 2.11 and 2.12
1 parent 34bbdaa commit acb60c6

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
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: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ name := "scala-parser-combinators"
66

77
version := "1.0.5-SNAPSHOT"
88

9-
scalaVersion := "2.11.6"
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)