Upgrade libraries, remove unused imports.

Might also be useful to reproduce scala/bug#10448 :)
trepidacious · Dec 31, 2017 · 87a3a72 · 87a3a72
1 parent bc47239
commit 87a3a72
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/build.sbt b/build.sbt
@@ -4,7 +4,7 @@ version in ThisBuild := "0.1-SNAPSHOT"
 
 organization in ThisBuild := "org.rebeam"
 
-scalaVersion in ThisBuild := "2.11.12"
+scalaVersion in ThisBuild := "2.12.4"
 
 scalacOptions in ThisBuild ++= Seq(
   "-feature",
@@ -21,7 +21,9 @@ resolvers += Resolver.sonatypeRepo("snapshots")
 //SLF4J simple logger, y u log to System.err by default, even for info?
 javaOptions in ThisBuild := Seq("-Dorg.slf4j.simpleLogger.logFile=System.out")
 
-val scalajsReactComponentsVersion = "0.5.0"
+val scalajsReactComponentsVersion = "0.8.0"
+val scalacssVersion = "0.5.3"
+val pathsScalaJsVersion = "0.4.5"
 
 val assetsDir = file("assets")
 
@@ -41,7 +43,7 @@ lazy val treeMaterialUi = crossProject.in(file(".")).
     libraryDependencies ++= Seq(
       "org.rebeam"                  %%%  "tree"    % "0.1-SNAPSHOT",
 
-      "org.log4s"   %% "log4s"                % "1.2.1",
+      "org.log4s"   %% "log4s"                % "1.3.3",
       "org.slf4j"   % "slf4j-simple"          % "1.7.21"
     ),
     //For @Lenses
@@ -57,9 +59,9 @@ lazy val treeMaterialUi = crossProject.in(file(".")).
   ).jsSettings(
     //Scalajs dependencies that are used on the client only
     libraryDependencies ++= Seq(
-      "com.github.chandu0101.scalajs-react-components"  %%% "core"                  % scalajsReactComponentsVersion,
-      "com.github.japgolly.scalacss"                    %%% "ext-react"             % "0.5.0",
-      "eu.unicredit"                                    %%% "paths-scala-js"        % "0.4.5"
+      "com.olvind"                                      %%% "scalajs-react-components"  % scalajsReactComponentsVersion,
+      "com.github.japgolly.scalacss"                    %%% "ext-react"                 % scalacssVersion,
+      "org.rebeam"                                      %%% "paths-scala-js"            % pathsScalaJsVersion
     ),
 
     crossTarget in (Compile, fullOptJS) := assetsDir,

diff --git a/jvm/src/main/scala/org/rebeam/tree/demo/ServerDemoApp.scala b/jvm/src/main/scala/org/rebeam/tree/demo/ServerDemoApp.scala
@@ -11,7 +11,6 @@ import org.http4s.server.staticcontent._
 import org.http4s.server.websocket._
 import org.rebeam.tree.{DeltaIOContext, DeltaIOContextSource, Moment}
 import org.rebeam.tree.server.{ServerStore, ServerStoreValueExchange}
-import org.rebeam.tree.view.MaterialColor
 import org.rebeam.tree.Delta._
 import org.rebeam.tree.sync.Sync._
 import org.rebeam.tree.sync.DeltaIORun._

diff --git a/shared/src/main/scala/org/rebeam/tree/demo/DemoData.scala b/shared/src/main/scala/org/rebeam/tree/demo/DemoData.scala
@@ -16,8 +16,6 @@ import org.rebeam.tree.sync._
 import org.rebeam.tree.sync.Sync._
 import cats.instances.list._
 import cats.syntax.traverse._
-import org.rebeam.tree.Searchable.notSearchable
-import shapeless.{::,HNil}
 
 import scala.collection.mutable.ListBuffer
 

diff --git a/shared/src/main/scala/org/rebeam/tree/demo/RefData.scala b/shared/src/main/scala/org/rebeam/tree/demo/RefData.scala
@@ -11,7 +11,6 @@ import org.rebeam.tree.sync.Sync._
 import org.rebeam.tree.sync._
 import org.rebeam.tree.BasicDeltaDecoders._
 import cats.instances.list._
-import cats.instances.option._
 import cats.syntax.traverse._
 
 import scala.collection.mutable.ListBuffer

diff --git a/shared/src/main/scala/org/rebeam/tree/demo/TaskData.scala b/shared/src/main/scala/org/rebeam/tree/demo/TaskData.scala
@@ -1,6 +1,5 @@
 package org.rebeam.tree.demo
 
-import io.circe._
 import io.circe.generic.JsonCodec
 import org.rebeam.lenses.macros.Lenses
 import org.rebeam.tree.Delta._