This repository was archived by the owner on Sep 8, 2022. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +15
-6
lines changed
Expand file tree Collapse file tree 2 files changed +15
-6
lines changed Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ language: scala
22script :
33 - sbt ++$TRAVIS_SCALA_VERSION clean update compile
44scala :
5- - 2.11.0-SNAPSHOT
5+ - 2.11.0
66jdk :
77 - openjdk6
88 - openjdk7
Original file line number Diff line number Diff line change @@ -4,16 +4,25 @@ scalaModuleSettings
44
55name := " scala-partest"
66
7- version := " 1.0.0 -SNAPSHOT"
7+ version := " 1.0.1 -SNAPSHOT"
88
9- scalaVersion := " 2.11.0-M8 "
9+ scalaVersion := " 2.11.0"
1010
11- scalaXmlVersion := " 1.0.0-RC7 "
11+ scalaXmlVersion := " 1.0.1 "
1212
1313scalaCheckVersion := " 1.11.3"
1414
15- // used as binary version when compiling against 2.11.0-SNAPSHOT
16- snapshotScalaBinaryVersion := " 2.11.0-M8"
15+ // used as binary version when compiling against 2.12.0-SNAPSHOT
16+ snapshotScalaBinaryVersion := " 2.11.0"
17+
18+ // TODO remove this after https://github.com/scala/sbt-scala-modules/pull/7
19+ // is merged and this build refers to the new plugin.
20+ scalaBinaryVersion := (
21+ if (scalaVersion.value.startsWith(" 2.12" ))
22+ snapshotScalaBinaryVersion.value
23+ else
24+ scalaBinaryVersion.value
25+ )
1726
1827// TODO: enable "-Xfatal-warnings" for nightlies,
1928// off by default because we don't want to break scala/scala pr validation due to deprecation
You can’t perform that action at this time.
0 commit comments