Merge pull request #9 from ThoughtWorksInc/Atry-patch-1

Atry · web-flow · commit 41b4e0412b0a · 2019-04-05T16:24:15.000+08:00
Update Scala version to 2.13.0-M5
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@ scala:
   - "2.10.7"
   - "2.11.12"
   - "2.12.6"
-  - "2.13.0-M4"
+  - "2.13.0-M5"
 
 jdk:
   - oraclejdk8
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1")
+addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1+9-73e78eb9")
 
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5")
 
diff --git a/shared/build.sbt b/shared/build.sbt
@@ -1 +1 @@
-libraryDependencies += "org.scalatest" %%% "scalatest" % "3.0.6-SNAP2" % Test
+libraryDependencies += "org.scalatest" %%% "scalatest" % "3.0.7" % Test

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1")`
	`1`	`+addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1+9-73e78eb9")`
`2`	`2`
`3`	`3`	`addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5")`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-libraryDependencies += "org.scalatest" %%% "scalatest" % "3.0.6-SNAP2" % Test`
	`1`	`+libraryDependencies += "org.scalatest" %%% "scalatest" % "3.0.7" % Test`