Skip to content
This repository was archived by the owner on May 3, 2018. It is now read-only.

Build for Scala 2.11.7 and 2.12.0-M3. #13

Merged
merged 1 commit into from
Dec 8, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ language: scala

env:
global:
- PUBLISH_JDK=openjdk6 # admin/build.sh only publishes when running on this jdk
# Don't commit sensitive files, instead commit a version encrypted with $SECRET,
# this environment variable is encrypted with this repo's private key and stored below:
# (See http://docs.travis-ci.com/user/environment-variables/#Secure-Variables.)
Expand All @@ -11,11 +10,9 @@ env:
script:
- admin/build.sh

scala:
- 2.11.2
jdk:
- openjdk6
- openjdk7
- oraclejdk8
notifications:
email:
- [email protected]
4 changes: 2 additions & 2 deletions admin/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# git on travis does not fetch tags, but we have TRAVIS_TAG
# headTag=$(git describe --exact-match ||:)

if [ "$TRAVIS_JDK_VERSION" == "$PUBLISH_JDK" ] && [[ "$TRAVIS_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)? ]]; then
if [[ "$TRAVIS_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)? ]]; then
echo "Going to release from tag $TRAVIS_TAG!"
myVer=$(echo $TRAVIS_TAG | sed -e s/^v//)
publishVersion='set every version := "'$myVer'"'
Expand All @@ -16,4 +16,4 @@ if [ "$TRAVIS_JDK_VERSION" == "$PUBLISH_JDK" ] && [[ "$TRAVIS_TAG" =~ ^v[0-9]+\.
(cd admin/ && ./decrypt.sh secring.asc)
fi

sbt ++$TRAVIS_SCALA_VERSION "$publishVersion" compile $extraTarget
sbt "$publishVersion" compile $extraTarget
16 changes: 13 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
scalaModuleSettings

version := "0.7.0-SNAPSHOT"
version := "0.8.0-SNAPSHOT"

scalaVersion := "2.11.4"
crossScalaVersions := {
val java = System.getProperty("java.version")
if (java.startsWith("1.6."))
Seq("2.11.7")
else if (java.startsWith("1.8."))
Seq("2.12.0-M3")
else
sys.error(s"don't know what Scala versions to build on $java")
}

snapshotScalaBinaryVersion := "2.11.4"
scalaVersion := crossScalaVersions.value.head

snapshotScalaBinaryVersion := scalaVersion.value

// dependencies:
libraryDependencies += "org.scala-sbt" % "test-interface" % "1.0"
Expand Down