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

Commit 7bfe0ef

Browse files
committed
Build for Scala 2.11.7 and 2.12.0-M3.
To be published as release 0.7.0.
1 parent 6b7754e commit 7bfe0ef

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ language: scala
22

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

14-
scala:
15-
- 2.11.2
1613
jdk:
1714
- openjdk6
18-
- openjdk7
15+
- oraclejdk8
1916
notifications:
2017
email:
2118

build.sbt

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
11
scalaModuleSettings
22

3-
version := "0.7.0-SNAPSHOT"
3+
version := "0.8.0-SNAPSHOT"
44

5-
scalaVersion := "2.11.4"
5+
crossScalaVersions := {
6+
val java = System.getProperty("java.version")
7+
if (java.startsWith("1.6."))
8+
Seq("2.11.7")
9+
else if (java.startsWith("1.8."))
10+
Seq("2.12.0-M3")
11+
else
12+
sys.error(s"don't know what Scala versions to build on $java")
13+
}
614

7-
snapshotScalaBinaryVersion := "2.11.4"
15+
scalaVersion := crossScalaVersions.value.head
16+
17+
snapshotScalaBinaryVersion := scalaVersion.value
818

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

0 commit comments

Comments
 (0)