Build for Scala 2.12.0

Author: japgolly

.travis.yml

@@ -3,6 +3,7 @@ sudo: false
 
 scala:
   - 2.11.8
+  - 2.12.0
 
 jdk:
   - oraclejdk8

core/src/main/scala/japgolly/scalajs/react/Callback.scala

@@ -16,11 +16,11 @@ import CallbackTo.MapGuard
  *
  * @see CallbackTo
  */
-object Callback {
+object Callback_TempHack {
   @implicitNotFound("You're wrapping a ${A} in a Callback which will discard without running it. Instead use CallbackTo(…).flatten or Callback{,To}.lazily(…).")
-  final class ResultGuard[A] private[Callback]()
+  final class ResultGuard[A] private[Callback_TempHack]()
   object ResultGuard {
-    final class Proof[A] private[Callback]()
+    final class Proof[A] private[Callback_TempHack]()
     object Proof {
       implicit def preventCallback1[A]: Proof[CallbackTo[A]] = ???
       implicit def preventCallback2[A]: Proof[CallbackTo[A]] = ???

core/src/main/scala/japgolly/scalajs/react/package.scala

@@ -14,6 +14,7 @@ package object react extends ReactEventAliases {
 
   type Callback  = CallbackTo[Unit]
   type CallbackB = CallbackTo[Boolean]
+  val Callback = Callback_TempHack
 
   @deprecated("Use CompState.AccessD.", "0.10.2")
   type StateAccessDirect[S] = CompState.AccessD[S]

doc/changelog/0.11.3.md

@@ -2,4 +2,6 @@
 
 * Generalize `ref(scope).tryFocus()` to `ref(scope).tryTo(HTMLElement => Unit)`.
 * Upgrade Scala.JS to v0.6.13.
-* Upgrade SBT to 0.13.13.
+* Build for Scala 2.12.0.
+* Upgrade Monocle to 1.3.2.
+* Upgrade Scalaz to 7.2.7.

project/Build.scala

@@ -9,14 +9,15 @@ object ScalajsReact {
 
   object Ver {
     val Scala211      = "2.11.8"
+    val Scala212      = "2.12.0"
     val ScalaJsDom    = "0.9.1"
     val ReactJs       = "15.3.2"
-    val Monocle       = "1.2.2"
-    val Scalaz72      = "7.2.6"
-    val MTest         = "0.4.3"
+    val Monocle       = "1.3.2"
+    val Scalaz72      = "7.2.7"
+    val MTest         = "0.4.4"
     val MacroParadise = "2.1.0"
     val SizzleJs      = "2.3.0"
-    val Nyaya         = "0.7.2"
+    val Nyaya         = "0.8.1"
   }
 
   type PE = Project => Project
@@ -30,7 +31,7 @@ object ScalajsReact {
         homepage           := Some(url("https://github.com/japgolly/scalajs-react")),
         licenses           += ("Apache-2.0", url("http://opensource.org/licenses/Apache-2.0")),
         scalaVersion       := Ver.Scala211,
-        // crossScalaVersions := Seq("2.10.4", Scala211), https://github.com/japgolly/scalajs-react/issues/39
+        crossScalaVersions := Seq(Ver.Scala211, Ver.Scala212),
         scalacOptions     ++= Seq("-deprecation", "-unchecked", "-feature",
                                 "-language:postfixOps", "-language:implicitConversions",
                                 "-language:higherKinds", "-language:existentials"),
@@ -123,8 +124,8 @@ object ScalajsReact {
     _.settings(
       scalacOptions += "-language:experimental.macros",
       libraryDependencies ++= Seq(
-        "org.scala-lang" % "scala-reflect"  % Ver.Scala211,
-        "org.scala-lang" % "scala-compiler" % Ver.Scala211 % "provided"))
+        "org.scala-lang" % "scala-reflect"  % scalaVersion.value,
+        "org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided"))
 
   def macroParadisePlugin =
     compilerPlugin("org.scalamacros" % "paradise" % Ver.MacroParadise cross CrossVersion.full)