Skip to content

Commit 09ad904

Browse files
committed
Merge pull request #13 from adriaanm/snapshots
Validate against 2.11.0-SNAPSHOT
2 parents 668ebe5 + 48e8c80 commit 09ad904

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ script:
44
- sbt ++$TRAVIS_SCALA_VERSION 'set concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)' test
55
scala:
66
- 2.10.3
7-
- 2.11.0-M6
7+
- 2.11.0-SNAPSHOT
88
jdk:
99
- oraclejdk6
1010
- openjdk7

build.sbt

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ scalaVersion := "2.11.0-M6"
1212
// but don't rebuild scalacheck, so we don't want to rewire that dependency)
1313
scalaBinaryVersion := "2.11.0-M6"
1414

15+
// to allow compiling against snapshot versions of Scala
16+
resolvers += Resolver.sonatypeRepo("snapshots")
1517

1618
// don't use for doc scope, scaladoc warnings are not to be reckoned with
1719
scalacOptions in compile ++= Seq("-optimize", "-Xfatal-warnings", "-feature", "-deprecation", "-unchecked", "-Xlint")
1820

19-
2021
// Generate $name.properties to store our version as well as the scala version used to build
2122
resourceGenerators in Compile <+= Def.task {
2223
val props = new java.util.Properties

0 commit comments

Comments
 (0)