Merge pull request #3 from ThoughtWorksInc/port-to-2.13

Atry · web-flow · commit 267d21d1883a · 2018-08-10T13:51:01.000+08:00
Build for Scala 2.13.0-M4
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ publishArtifact := false
 
 organization in ThisBuild := "com.thoughtworks.extractor"
 
-crossScalaVersions in ThisBuild := Seq("2.10.6", "2.11.8", "2.12.0")
+crossScalaVersions in ThisBuild := Seq("2.10.7", "2.11.12", "2.12.6", "2.13.0-M4")
 
 lazy val extractor = crossProject in file(".")
 
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.13
+sbt.version=0.13.17
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -2,4 +2,4 @@ addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "1.6.0
 
 addSbtPlugin("com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "latest.release")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.24")
diff --git a/shared/build.sbt b/shared/build.sbt
@@ -1 +1 @@
-libraryDependencies += "org.scalatest" %%% "scalatest" % "3.0.0" % Test
+libraryDependencies += "org.scalatest" %%% "scalatest" % "3.0.6-SNAP1" % Test

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "1.6.0`
`2`	`2`
`3`	`3`	`addSbtPlugin("com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "latest.release")`
`4`	`4`
`5`		`-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")`
	`5`	`+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.24")`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-libraryDependencies += "org.scalatest" %%% "scalatest" % "3.0.0" % Test`
	`1`	`+libraryDependencies += "org.scalatest" %%% "scalatest" % "3.0.6-SNAP1" % Test`