diff --git a/.travis.yml b/.travis.yml index d5b69bb4..7fcfd0eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ env: script: - admin/build.sh scala: - - 2.11.2 + - 2.11.4 jdk: - openjdk6 - openjdk7 diff --git a/build.sbt b/build.sbt index 4c513616..e1c449a3 100644 --- a/build.sbt +++ b/build.sbt @@ -1,12 +1,11 @@ -import com.typesafe.tools.mima.plugin.{MimaPlugin, MimaKeys} scalaModuleSettings name := "scala-parser-combinators" -version := "1.0.3-SNAPSHOT" +version := "1.1.0-SNAPSHOT" -scalaVersion := "2.11.2" +scalaVersion := "2.11.4" snapshotScalaBinaryVersion := "2.11" @@ -21,13 +20,3 @@ fork in Test := true libraryDependencies += "junit" % "junit" % "4.11" % "test" libraryDependencies += "com.novocode" % "junit-interface" % "0.10" % "test" - -MimaPlugin.mimaDefaultSettings - -MimaKeys.previousArtifact := Some(organization.value % s"${name.value}_2.11" % "1.0.2") - -// run mima during tests -test in Test := { - MimaKeys.reportBinaryIssues.value - (test in Test).value -} diff --git a/project/plugins.sbt b/project/plugins.sbt index 5f604e6f..dec42581 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,2 @@ addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.2") -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.6")