Merge branch 'master' into topic/neo

Author: japgolly

doc/TESTING.md

@@ -34,18 +34,18 @@ Setup
     // NOTE: Requires react-with-addons.js instead of just react.js
     jsDependencies ++= Seq(
 
-      "org.webjars.bower" % "react" % "15.3.2" % "test"
+      "org.webjars.bower" % "react" % "15.4.2" % "test"
         /        "react-with-addons.js"
         minified "react-with-addons.min.js"
         commonJSName "React",
 
-      "org.webjars.bower" % "react" % "15.3.2" % "test"
+      "org.webjars.bower" % "react" % "15.4.2" % "test"
         /         "react-dom.js"
         minified  "react-dom.min.js"
         dependsOn "react-with-addons.js"
         commonJSName "ReactDOM",
 
-      "org.webjars.bower" % "react" % "15.3.2" % "test"
+      "org.webjars.bower" % "react" % "15.4.2" % "test"
         /         "react-dom-server.js"
         minified  "react-dom-server.min.js"
         dependsOn "react-dom.js"

doc/USAGE.md

@@ -31,18 +31,18 @@ Setup
   // React JS itself (Note the filenames, adjust as needed, eg. to remove addons.)
   jsDependencies ++= Seq(
 
-    "org.webjars.bower" % "react" % "15.3.2"
+    "org.webjars.bower" % "react" % "15.4.2"
       /        "react-with-addons.js"
       minified "react-with-addons.min.js"
       commonJSName "React",
 
-    "org.webjars.bower" % "react" % "15.3.2"
+    "org.webjars.bower" % "react" % "15.4.2"
       /         "react-dom.js"
       minified  "react-dom.min.js"
       dependsOn "react-with-addons.js"
       commonJSName "ReactDOM",
 
-    "org.webjars.bower" % "react" % "15.3.2"
+    "org.webjars.bower" % "react" % "15.4.2"
       /         "react-dom-server.js"
       minified  "react-dom-server.min.js"
       dependsOn "react-dom.js"

doc/changelog/0.11.4.md

@@ -1,4 +1,5 @@
 ## 0.11.4
 
+* Upgrade React to 15.4.2.
 * Upgrade to Scala 2.12.1. Remove `Callback_TempHack`.
 * `ReactTestUtils`: Add asynchronous versions of `withRenderedInto{Body,Document}`.

project/Build.scala

@@ -8,7 +8,7 @@ object ScalajsReact {
     val Scala211      = "2.11.8"
     val Scala212      = "2.12.1"
     val ScalaJsDom    = "0.9.1"
-    val ReactJs       = "15.3.2"
+    val ReactJs       = "15.4.2"
     val Monocle       = "1.4.0"
     val Scalaz72      = "7.2.9"
     val MTest         = "0.4.5"