Merge pull request #12 from danslapman/master

Cross-compilation with 2.12.0

Author: adriaanm

.travis.yml

@@ -2,19 +2,27 @@ language: scala
 
 env:
   global:
-    - PUBLISH_JDK=openjdk6 # admin/build.sh only publishes when running on this jdk
+    - PUBLISH_JDK=openjdk8 # admin/build.sh only publishes when running on this jdk
 # Don't commit sensitive files, instead commit a version encrypted with $SECRET,
 # this environment variable is encrypted with this repo's private key and stored below:
 # (See http://docs.travis-ci.com/user/environment-variables/#Secure-Variables.)
     - secure: "apmuVagS7WgWzg9HeDLCcX4INxazi50qukOfPkvluJjm58RCJsDwaZseXrQGqyPzRKuBnAetJ4NDWbZMRkm6QpTiH8grPwDl6iNUSVivvzOZGl3Iy8LvNxUv6CYoQBG+R7d8dW//1xcoHtT2zYo3dYEFpSelfNMMLADNUKXSQmI="
 
+before_install:
+  - sudo hostname "$(hostname | cut -c1-63)"
+  - sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" /etc/hosts | sudo tee /etc/hosts
 script:
   - admin/build.sh
 scala:
-  - 2.11.4
+  - 2.11.8
+  - 2.12.0-M4
 jdk:
   - openjdk6
-  # - openjdk7
+  - oraclejdk8
+matrix:
+  exclude:
+    - scala: 2.12.0-M4
+      jdk: openjdk6
 notifications:
   email:
     - adriaan.moors@typesafe.com

build.sbt

@@ -7,9 +7,10 @@ import com.typesafe.sbt.osgi.{OsgiKeys, SbtOsgi}
 lazy val commonSettings = scalaModuleSettings ++ Seq(
   repoName                   := "scala-continuations",
   organization               := "org.scala-lang.plugins",
-  version                    := "1.0.1-SNAPSHOT",
-  scalaVersion               := "2.11.4",
-  snapshotScalaBinaryVersion := "2.11.4",
+  version                    := "1.0.3-SNAPSHOT",
+  scalaVersion               := "2.11.8",
+  crossScalaVersions         := Seq("2.11.8", "2.12.0-M4"),
+  snapshotScalaBinaryVersion := "2.11.8",
   scalacOptions ++= Seq(
     "-deprecation",
     "-feature")
@@ -29,7 +30,7 @@ val pluginJar = packageTask in (plugin, Compile)
 // TODO: the library project's test are really plugin tests, but we first need that jar
 lazy val library = project settings (scalaModuleOsgiSettings: _*) settings (MimaPlugin.mimaDefaultSettings: _*) settings (
   name                       := "scala-continuations-library",
-  MimaKeys.previousArtifact  := Some(organization.value % s"${name.value}_2.11.0-RC1" % "1.0.0"),
+  MimaKeys.mimaPreviousArtifacts  := Set(organization.value % s"${name.value}_2.11.0-RC1" % "1.0.0"),
   scalacOptions       ++= Seq(
     // add the plugin to the compiler
     s"-Xplugin:${pluginJar.value.getAbsolutePath}",
@@ -48,7 +49,7 @@ lazy val library = project settings (scalaModuleOsgiSettings: _*) settings (Mima
   ),
   // run mima during tests
   test in Test := {
-    MimaKeys.reportBinaryIssues.value
+    MimaKeys.mimaReportBinaryIssues.value
     (test in Test).value
   },
   OsgiKeys.exportPackage := Seq(s"scala.util.continuations;version=${version.value}")

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.7
+sbt.version=0.13.11

project/plugins.sbt

@@ -1,3 +1,3 @@
 addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.2")
 
-addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.6")
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.9")