diff --git a/.travis.yml b/.travis.yml index 7fcfd0eb..c37a04c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ env: script: - admin/build.sh scala: - - 2.11.4 + - 2.11.6 jdk: - openjdk6 - openjdk7 diff --git a/README.md b/README.md index 589bfb82..70cc4b5c 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ As of Scala 2.11, this library is a separate jar that can be omitted from Scala To depend on scala-parser-combinators in SBT, add something like this to your build.sbt: ``` -libraryDependencies += "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.3" +libraryDependencies += "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.4" ``` (Assuming you're using a `scalaVersion` for which a scala-parser-combinators is published. The first 2.11 milestone for which this is true is 2.11.0-M4.) diff --git a/build.sbt b/build.sbt index e1c449a3..2bee54b1 100644 --- a/build.sbt +++ b/build.sbt @@ -5,9 +5,7 @@ name := "scala-parser-combinators" version := "1.1.0-SNAPSHOT" -scalaVersion := "2.11.4" - -snapshotScalaBinaryVersion := "2.11" +scalaVersion := "2.11.6" // important!! must come here (why?) scalaModuleOsgiSettings @@ -20,3 +18,5 @@ fork in Test := true libraryDependencies += "junit" % "junit" % "4.11" % "test" libraryDependencies += "com.novocode" % "junit-interface" % "0.10" % "test" + +mimaPreviousVersion := None diff --git a/project/build.properties b/project/build.properties index 748703f7..a6e117b6 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.7 +sbt.version=0.13.8 diff --git a/project/plugins.sbt b/project/plugins.sbt index dec42581..25f33731 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1 @@ -addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.2") - +addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.3")