Merge pull request #15 from xuwei-k/Scala-2.13.0-M2

thesamet · web-flow · commit 30b846fc1b2c · 2018-01-03T22:03:00.000-08:00
Scala 2.13.0-M2
diff --git a/.travis.yml b/.travis.yml
@@ -7,5 +7,5 @@ matrix:
   include:
   - scala: 2.12.2
     jdk: oraclejdk8
-  - scala: 2.13.0-M1
+  - scala: 2.13.0-M2
     jdk: oraclejdk8
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ import ReleaseTransformations._
 
 scalaVersion := "2.11.11"
 
-crossScalaVersions := Seq("2.11.11", "2.10.6", "2.12.2", "2.13.0-M1")
+crossScalaVersions := Seq("2.11.11", "2.10.6", "2.12.2", "2.13.0-M2")
 
 organization in ThisBuild := "com.thesamet.scalapb"
 
@@ -47,7 +47,7 @@ lazy val lenses = crossProject.in(file("."))
   .jvmSettings(
     libraryDependencies ++= Seq(
       "org.scalacheck" %%% "scalacheck" % "1.13.5" % "test",
-      "org.scalatest" %%% "scalatest" % "3.0.3" % "test"
+      "org.scalatest" %%% "scalatest" % "3.0.4" % "test"
     )
   )
   .jsSettings(

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ import ReleaseTransformations._`
`2`	`2`
`3`	`3`	`scalaVersion := "2.11.11"`
`4`	`4`
`5`		`-crossScalaVersions := Seq("2.11.11", "2.10.6", "2.12.2", "2.13.0-M1")`
	`5`	`+crossScalaVersions := Seq("2.11.11", "2.10.6", "2.12.2", "2.13.0-M2")`
`6`	`6`
`7`	`7`	`organization in ThisBuild := "com.thesamet.scalapb"`
`8`	`8`
`@@ -47,7 +47,7 @@ lazy val lenses = crossProject.in(file("."))`
`47`	`47`	`.jvmSettings(`
`48`	`48`	`libraryDependencies ++= Seq(`
`49`	`49`	`"org.scalacheck" %%% "scalacheck" % "1.13.5" % "test",`
`50`		`- "org.scalatest" %%% "scalatest" % "3.0.3" % "test"`
	`50`	`+ "org.scalatest" %%% "scalatest" % "3.0.4" % "test"`
`51`	`51`	`)`
`52`	`52`	`)`
`53`	`53`	`.jsSettings(`