Merge pull request #13 from SethTisue/version-bumps

use (much!) newer MiMa (and sbt & Travis while we're at it)

Author: adriaanm

.gitignore

@@ -0,0 +1 @@
+target/

.travis.yml

@@ -0,0 +1,26 @@
+# opt-in to Travis's newer/faster container-based infrastructure
+sudo: false
+
+language: scala
+
+jdk:
+  - openjdk6
+
+# cache stuff, hopefully shortening build times
+cache:
+  directories:
+  - $HOME/.ivy2
+  - $HOME/.sbt/boot
+  - $HOME/.sbt/launchers
+
+script:
+  - sbt test
+
+before_cache:
+  - find $HOME/.sbt -name "*.lock" | xargs rm
+  - find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm
+
+notifications:
+  email:
+  - [email protected]
+  - [email protected]

build.sbt

@@ -30,4 +30,4 @@ bintrayOrganization := None
 //      See code changes and docs: https://github.com/sbt/sbt-osgi/commit/e3625e685b8d1784938ec66067d629251811a9d1
 addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0")
 
-addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.8")
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.12")

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.9
+sbt.version=0.13.13

src/main/scala/ScalaModulePlugin.scala

@@ -1,7 +1,7 @@
 import sbt._
 import Keys._
 import com.typesafe.sbt.osgi.{OsgiKeys, SbtOsgi}
-import com.typesafe.tools.mima.plugin.{MimaPlugin, MimaKeys}
+import com.typesafe.tools.mima.plugin.{MimaPlugin, MimaKeys}, MimaKeys._
 
 object ScalaModulePlugin extends Plugin {
   val repoName                   = settingKey[String]("The name of the repository under github.com/scala/.")
@@ -30,15 +30,15 @@ object ScalaModulePlugin extends Plugin {
     scalacOptions in compile ++= Seq("-optimize", "-feature", "-deprecation", "-unchecked", "-Xlint"),
 
     // Generate $name.properties to store our version as well as the scala version used to build
-    resourceGenerators in Compile <+= Def.task {
+    resourceGenerators in Compile += Def.task {
       val props = new java.util.Properties
       props.put("version.number", version.value)
       props.put("scala.version.number", scalaVersion.value)
       props.put("scala.binary.version.number", scalaBinaryVersion.value)
       val file = (resourceManaged in Compile).value / s"${name.value}.properties"
       IO.write(props, null, file)
       Seq(file)
-    },
+    }.taskValue,
 
     mappings in (Compile, packageBin) += {
        (baseDirectory.value / s"${name.value}.properties") -> s"${name.value}.properties"
@@ -112,7 +112,7 @@ object ScalaModulePlugin extends Plugin {
 
   lazy val mimaSettings: Seq[Setting[_]] = MimaPlugin.mimaDefaultSettings ++ Seq(
     // manual cross-versioning because https://github.com/typesafehub/migration-manager/issues/62
-    MimaKeys.previousArtifact := Some(organization.value % s"${name.value}_${scalaBinaryVersion.value}" % mimaPreviousVersion.value.getOrElse("dummy")),
+    mimaPreviousArtifacts := Set(organization.value % s"${name.value}_${scalaBinaryVersion.value}" % mimaPreviousVersion.value.getOrElse("dummy")),
 
     canRunMima := {
       val mimaVer = mimaPreviousVersion.value
@@ -129,7 +129,7 @@ object ScalaModulePlugin extends Plugin {
     },
 
     runMimaIfEnabled := Def.taskDyn({
-      if(canRunMima.value) Def.task { MimaKeys.reportBinaryIssues.value }
+      if(canRunMima.value) Def.task { mimaReportBinaryIssues.value }
       else Def.task { () }
     }).value,