Skip to content
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 @@ -11,7 +11,7 @@ env:
script:
- admin/build.sh
scala:
- 2.11.2
- 2.11.4
jdk:
- openjdk6
- openjdk7
Expand Down
15 changes: 2 additions & 13 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -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
}
1 change: 0 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.2")

addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.6")