Merge pull request #162 from retronym/bump/RC2

retronym · web-flow · commit 9ee801309b14 · 2016-10-18T21:49:54.000+11:00
Bump Scala version to 2.12.0-RC2
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ env:
 # (See http://docs.travis-ci.com/user/environment-variables/#Secure-Variables.)
     - secure: "YO/7YiWEirzz0EAy7oVNmAKroj4qCLZNMkPS+xW/VgeGjuEV+Nk1S7pwxF0o2OggSxIQ+a0lWSrOPQqSXMjOstDIzzGeYfuAt0+0fupXtDDge0mXpCCMadrvYzff1/5XYX0dJ+pjJmz6IgF1hliPJHIuddhhdqPxdHWTHAKm9ME="
 
-script: 
+script:
   - admin/build.sh
 matrix:
   include:
@@ -16,10 +16,10 @@ matrix:
     env: IS_PUBLISH_JDK=true
   - scala: 2.11.8
     jdk: oraclejdk8
-  - scala: 2.12.0-RC1
+  - scala: 2.12.0-RC2
     jdk: oraclejdk8
     env: IS_PUBLISH_JDK=true
 notifications:
   email:
     - jason.zaugg@typesafe.com
-    - philipp.haller@typesafe.com
+    - philipp.haller@typesafe.com
diff --git a/build.sbt b/build.sbt
@@ -1,4 +1,4 @@
-crossScalaVersions := List("2.11.8", "2.12.0-RC1")
+crossScalaVersions := List("2.11.8", "2.12.0-RC2")
 
 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-RC1")`
	`1`	`+crossScalaVersions := List("2.11.8", "2.12.0-RC2")`
`2`	`2`
`3`	`3`	`scalaVersion := crossScalaVersions.value.head`
`4`	`4`