Merge pull request #173 from SethTisue/scala-2.13.0-M2

SethTisue · web-flow · commit c09aa7792c22 · 2017-08-05T21:51:53.000-04:00
support Scala 2.13.0-M2
diff --git a/build.sbt b/build.sbt
@@ -4,8 +4,8 @@ scalaModuleSettings
 
 scalaVersionsByJvm in ThisBuild :={
 val v211 = "2.11.11"
- val v212 = "2.12.2"
- val v213 = "2.13.0-M1"
+ val v212 = "2.12.3"
+ val v213 = "2.13.0-M2"
 
 Map(
 6 -> List(v211 -> true),
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.15
+sbt.version=0.13.16
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.8")
+addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.12")

-Original file line number
+Diff line change
 scalaVersionsByJvm in ThisBuild:={
 valv211="2.11.11"
 -valv212="2.12.2"
 -valv213="2.13.0-M1"
 +valv212="2.12.3"
 +valv213="2.13.0-M2"
 Map(
 ->List(v211 ->true),
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-addSbtPlugin("org.scala-lang.modules"%"scala-module-plugin"%"1.0.8")`
	`1`	`+addSbtPlugin("org.scala-lang.modules"%"sbt-scala-module"%"1.0.12")`