Skip to content
This repository was archived by the owner on Sep 8, 2022. It is now read-only.

Bump versions after the 2.11.0 release. #19

Merged
merged 4 commits into from
May 6, 2014
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: scala
script:
- sbt ++$TRAVIS_SCALA_VERSION clean update compile
scala:
- 2.11.0-SNAPSHOT
- 2.11.0
jdk:
- openjdk6
- openjdk7
Expand Down
19 changes: 14 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,25 @@ scalaModuleSettings

name := "scala-partest"

version := "1.0.0-SNAPSHOT"
version := "1.0.1-SNAPSHOT"

scalaVersion := "2.11.0-M8"
scalaVersion := "2.11.0"

scalaXmlVersion := "1.0.0-RC7"
scalaXmlVersion := "1.0.1"

scalaCheckVersion := "1.11.3"

// used as binary version when compiling against 2.11.0-SNAPSHOT
snapshotScalaBinaryVersion := "2.11.0-M8"
// used as binary version when compiling against 2.12.0-SNAPSHOT
snapshotScalaBinaryVersion := "2.11.0"

// TODO remove this after https://github.com/scala/sbt-scala-modules/pull/7
// is merged and this build refers to the new plugin.
scalaBinaryVersion := (
if (scalaVersion.value.startsWith("2.12"))
snapshotScalaBinaryVersion.value
else
scalaBinaryVersion.value
)

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