Upgraded react to v17, fixed #6

Author: viktor-podzigun

README.md

@@ -7,7 +7,7 @@
 
 Develop React applications with Scala.
 
-It is compatible with Scala `2.12`, `2.13`, Scala.js `0.6.29`, `1.1.0` and with React.js `v16.8+`.
+It is compatible with Scala `2.12`, `2.13`, Scala.js `0.6.29`, `1.1.0` and with React.js `v17+`.
 
 Optionally include `react-router` and `react-redux` facades, too.
 
@@ -49,7 +49,6 @@ ReactDOM.render(<.div(^.id := "hello-world")("Hello, World!"), mountNode)
      "org.scommons.shogowada" %%% "scalajs-reactjs-dom" % "0.16.0", // For react-dom facade
 
      "org.scommons.shogowada" %%% "scalajs-reactjs-router-dom" % "0.16.0", // Optional. For react-router-dom facade
-     "org.scommons.shogowada" %%% "scalajs-reactjs-router-redux" % "0.16.0", // Optional. For react-router-redux facade
      "org.scommons.shogowada" %%% "scalajs-reactjs-redux" % "0.16.0", // Optional. For react-redux facade
      "org.scommons.shogowada" %%% "scalajs-reactjs-redux-devtools" % "0.16.0" // Optional. For redux-devtools facade
    )
@@ -62,7 +61,6 @@ ReactDOM.render(<.div(^.id := "hello-world")("Hello, World!"), mountNode)
 - [Router](/example/routing/src/main/scala/io/github/shogowada/scalajs/reactjs/example/router/Main.scala)
 - [Redux](/example/todo-app-redux/src/main/scala/io/github/shogowada/scalajs/reactjs/example/todoappredux)
 - [Redux Middleware](/example/redux-middleware/src/main/scala/io/github/shogowada/scalajs/reactjs/example/redux/middleware/Main.scala)
-- [Router Redux](/example/router-redux/src/main/scala/io/github/shogowada/scalajs/reactjs/example/router/redux/Main.scala)
 - [Redux DevTools](/example/redux-devtools/src/main/scala/io/github/shogowada/scalajs/reactjs/example/redux/devtools/Main.scala)
 - [I don't like `<` and `^`. How can I change them?](/example/custom-virtual-dom)
 

build.sbt

@@ -1,12 +1,11 @@
 val HistoryVersion = "^4.6.1"
-val ReactVersion = "^16.8.0"
-val ReactReduxVersion = "^5.0.3"
-val ReactRouterVersion = "^4.0.0"
-val ReactRouterReduxVersion = "next"
+val ReactVersion = "^17.0.1"
+val ReactReduxVersion = "^7.2.4"
+val ReactRouterVersion = "^5.2.1"
 val ReduxVersion = "^3.6.0"
 val ReduxDevToolsVersion = "^2.13.0"
 
-val StaticTagsVersion = "2.6.1"
+val StaticTagsVersion = "2.7.0-SNAPSHOT"
 
 val commonSettings = Seq(
   organization := "org.scommons.shogowada",
@@ -17,7 +16,7 @@ val commonSettings = Seq(
     "-deprecation", "-unchecked", "-feature", "-Xcheckinit", "-target:jvm-1.8", "-Xfatal-warnings"
   ),
 
-  //resolvers += "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/",
+  resolvers += "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/",
 
   sonatypeProfileName := "org.scommons",
   publishArtifact := false,
@@ -72,7 +71,6 @@ lazy val root = (project in file("."))
       routerDom,
       redux,
       reduxDevTools,
-      routerRedux,
       exampleCustomVirtualDOM,
       exampleHelloWorld,
       exampleHelloWorldFunction,
@@ -81,7 +79,6 @@ lazy val root = (project in file("."))
       exampleReduxDevTools,
       exampleReduxMiddleware,
       exampleRouter,
-      exampleRouterRedux,
       exampleStyle,
       exampleTodoApp,
       exampleTodoAppRedux,
@@ -191,20 +188,6 @@ lazy val reduxDevTools = project.in(file("redux-devtools"))
     .enablePlugins(ScalaJSPlugin, ScalaJSBundlerPlugin)
     .dependsOn(redux)
 
-lazy val routerRedux = project.in(file("router-redux"))
-    .settings(commonSettings: _*)
-    .settings(
-      name := "scalajs-reactjs-router-redux",
-      npmDependencies in Compile ++= Seq(
-        "react-router-redux" -> ReactRouterReduxVersion
-      ),
-      (webpack in(Compile, fastOptJS)) := Seq(),
-      (webpack in(Compile, fullOptJS)) := Seq(),
-      publishArtifact := true
-    )
-    .enablePlugins(ScalaJSPlugin, ScalaJSBundlerPlugin)
-    .dependsOn(history, router, redux)
-
 val exampleCommonSettings = commonSettings ++ Seq(
   name := "scalajs-reactjs-example",
   scalaJSUseMainModuleInitializer := true,
@@ -275,14 +258,6 @@ lazy val exampleRouter = project.in(file("example") / "router")
     .enablePlugins(ScalaJSPlugin, ScalaJSBundlerPlugin)
     .dependsOn(dom, routerDom)
 
-lazy val exampleRouterRedux = project.in(file("example") / "router-redux")
-    .settings(exampleCommonSettings: _*)
-    .settings(
-      name += "-router-redux"
-    )
-    .enablePlugins(ScalaJSPlugin, ScalaJSBundlerPlugin)
-    .dependsOn(dom, redux, routerDom, routerRedux, reduxDevTools)
-
 lazy val exampleStyle = project.in(file("example") / "style")
     .settings(exampleCommonSettings: _*)
     .settings(
@@ -332,7 +307,6 @@ lazy val exampleTest = project.in(file("example") / "test")
         s"-Dtarget.path.redux-devtools=${(crossTarget in exampleReduxDevTools).value}",
         s"-Dtarget.path.redux-middleware=${(crossTarget in exampleReduxMiddleware).value}",
         s"-Dtarget.path.router=${(crossTarget in exampleRouter).value}",
-        s"-Dtarget.path.router-redux=${(crossTarget in exampleRouterRedux).value}",
         s"-Dtarget.path.style=${(crossTarget in exampleStyle).value}",
         s"-Dtarget.path.todo-app=${(crossTarget in exampleTodoApp).value}",
         s"-Dtarget.path.todo-app-redux=${(crossTarget in exampleTodoAppRedux).value}"
@@ -346,7 +320,6 @@ lazy val exampleTest = project.in(file("example") / "test")
         webpack in fastOptJS in Compile in exampleReduxDevTools,
         webpack in fastOptJS in Compile in exampleReduxMiddleware,
         webpack in fastOptJS in Compile in exampleRouter,
-        webpack in fastOptJS in Compile in exampleRouterRedux,
         webpack in fastOptJS in Compile in exampleStyle,
         webpack in fastOptJS in Compile in exampleTodoApp,
         webpack in fastOptJS in Compile in exampleTodoAppRedux

example/README.md

@@ -157,5 +157,4 @@ Sure, you can! All the projects in this folder are fully working examples, but h
 - [Router](/example/routing/src/main/scala/io/github/shogowada/scalajs/reactjs/example/router/Main.scala)
 - [Redux](/example/todo-app-redux/src/main/scala/io/github/shogowada/scalajs/reactjs/example/todoappredux)
 - [Redux Middleware](/example/redux-middleware/src/main/scala/io/github/shogowada/scalajs/reactjs/example/redux/middleware/Main.scala)
-- [Router Redux](/example/router-redux/src/main/scala/io/github/shogowada/scalajs/reactjs/example/router/redux/Main.scala)
 - [Redux DevTools](/example/redux-devtools/src/main/scala/io/github/shogowada/scalajs/reactjs/example/redux/devtools/Main.scala)

example/router-redux/src/main/scala/io/github/shogowada/scalajs/reactjs/example/router/redux/Main.scala

@@ -57,7 +57,6 @@ object TestTargetServers {
   lazy val reduxDevTools = init(new TestTargetServer("redux-devtools"))
   lazy val reduxMiddleware = init(new TestTargetServer("redux-middleware"))
   lazy val router = init(new TestTargetServer("router"))
-  lazy val routerRedux = init(new TestTargetServer("router-redux"))
   lazy val style = init(new TestTargetServer("style"))
   lazy val todoApp = init(new TestTargetServer("todo-app"))
   lazy val todoAppRedux = init(new TestTargetServer("todo-app-redux"))