Merge pull request #60 from retronym/topic/enable-2.12

retronym · retronym · commit 70fa4da906a7 · 2015-12-22T13:48:27.000+11:00
Enable cross build for 2.12.0-M3
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ script:
   - admin/build.sh
 scala:
   - 2.11.7
-  # - 2.12.0-M3
+  - 2.12.0-M3
 jdk:
   - oraclejdk8
 notifications:
diff --git a/build.sbt b/build.sbt
@@ -10,7 +10,7 @@ def jwrite(dir: java.io.File)(name: String, content: String) = {
 
 lazy val commonSettings = Seq(
   scalaVersion := "2.11.7",
-  crossScalaVersions := List("2.11.7" /* TODO, "2.12.0-M3"*/),
+  crossScalaVersions := List("2.11.7", "2.12.0-M3"),
   organization := "org.scala-lang.modules",
   version := "0.6.0-SNAPSHOT"
 )

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ def jwrite(dir: java.io.File)(name: String, content: String) = {`
`10`	`10`
`11`	`11`	`lazy val commonSettings = Seq(`
`12`	`12`	`scalaVersion := "2.11.7",`
`13`		`- crossScalaVersions := List("2.11.7" /* TODO, "2.12.0-M3"*/),`
	`13`	`+ crossScalaVersions := List("2.11.7", "2.12.0-M3"),`
`14`	`14`	`organization := "org.scala-lang.modules",`
`15`	`15`	`version := "0.6.0-SNAPSHOT"`
`16`	`16`	`)`