Merge pull request #163 from retronym/bump/2.12.0

retronym · web-flow · commit ef70504bb959 · 2016-10-30T09:12:38.000+11:00
Bump to Scala 2.12.0
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ matrix:
     env: IS_PUBLISH_JDK=true
   - scala: 2.11.8
     jdk: oraclejdk8
-  - scala: 2.12.0-RC2
+  - scala: 2.12.0
     jdk: oraclejdk8
     env: IS_PUBLISH_JDK=true
 notifications:
diff --git a/build.sbt b/build.sbt
@@ -1,4 +1,4 @@
-crossScalaVersions := List("2.11.8", "2.12.0-RC2")
+crossScalaVersions := List("2.11.8", "2.12.0")
 
 scalaVersion := crossScalaVersions.value.head
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-crossScalaVersions := List("2.11.8", "2.12.0-RC2")`
	`1`	`+crossScalaVersions := List("2.11.8", "2.12.0")`
`2`	`2`
`3`	`3`	`scalaVersion := crossScalaVersions.value.head`
`4`	`4`