Skip to content
This repository was archived by the owner on Jun 23, 2020. It is now read-only.

Commit 4615a94

Browse files
committed
Setup cross-compilation
1 parent aaff622 commit 4615a94

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ language: scala
22

33
env:
44
global:
5-
- PUBLISH_JDK=openjdk6 # admin/build.sh only publishes when running on this jdk
5+
- PUBLISH_JDK=openjdk8 # admin/build.sh only publishes when running on this jdk
66
# Don't commit sensitive files, instead commit a version encrypted with $SECRET,
77
# this environment variable is encrypted with this repo's private key and stored below:
88
# (See http://docs.travis-ci.com/user/environment-variables/#Secure-Variables.)
@@ -12,9 +12,10 @@ script:
1212
- admin/build.sh
1313
scala:
1414
- 2.11.4
15+
- 2.12.0-M4
1516
jdk:
1617
- openjdk6
17-
# - openjdk7
18+
- openjdk8
1819
notifications:
1920
email:
2021
- adriaan.moors@typesafe.com

build.sbt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ import com.typesafe.sbt.osgi.{OsgiKeys, SbtOsgi}
77
lazy val commonSettings = scalaModuleSettings ++ Seq(
88
repoName := "scala-continuations",
99
organization := "org.scala-lang.plugins",
10-
version := "1.0.1-SNAPSHOT",
11-
scalaVersion := "2.11.4",
12-
snapshotScalaBinaryVersion := "2.11.4",
10+
version := "1.0.3-SNAPSHOT",
11+
scalaVersion := "2.11.8",
12+
crossScalaVersions := Seq("2.11.8", "2.12.0-M4"),
13+
snapshotScalaBinaryVersion := "2.11.8",
1314
scalacOptions ++= Seq(
1415
"-deprecation",
1516
"-feature")
@@ -29,7 +30,7 @@ val pluginJar = packageTask in (plugin, Compile)
2930
// TODO: the library project's test are really plugin tests, but we first need that jar
3031
lazy val library = project settings (scalaModuleOsgiSettings: _*) settings (MimaPlugin.mimaDefaultSettings: _*) settings (
3132
name := "scala-continuations-library",
32-
MimaKeys.previousArtifact := Some(organization.value % s"${name.value}_2.11.0-RC1" % "1.0.0"),
33+
MimaKeys.mimaPreviousArtifacts := Set(organization.value % s"${name.value}_2.11.0-RC1" % "1.0.0"),
3334
scalacOptions ++= Seq(
3435
// add the plugin to the compiler
3536
s"-Xplugin:${pluginJar.value.getAbsolutePath}",
@@ -48,7 +49,7 @@ lazy val library = project settings (scalaModuleOsgiSettings: _*) settings (Mima
4849
),
4950
// run mima during tests
5051
test in Test := {
51-
MimaKeys.reportBinaryIssues.value
52+
MimaKeys.mimaReportBinaryIssues.value
5253
(test in Test).value
5354
},
5455
OsgiKeys.exportPackage := Seq(s"scala.util.continuations;version=${version.value}")

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.2")
22

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

0 commit comments

Comments
 (0)