Skip to content

Commit 87a3a72

Browse files
committed
Upgrade libraries, remove unused imports.
Might also be useful to reproduce scala/bug#10448 :)
1 parent bc47239 commit 87a3a72

File tree

5 files changed

+8
-11
lines changed

5 files changed

+8
-11
lines changed

build.sbt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version in ThisBuild := "0.1-SNAPSHOT"
44

55
organization in ThisBuild := "org.rebeam"
66

7-
scalaVersion in ThisBuild := "2.11.12"
7+
scalaVersion in ThisBuild := "2.12.4"
88

99
scalacOptions in ThisBuild ++= Seq(
1010
"-feature",
@@ -21,7 +21,9 @@ resolvers += Resolver.sonatypeRepo("snapshots")
2121
//SLF4J simple logger, y u log to System.err by default, even for info?
2222
javaOptions in ThisBuild := Seq("-Dorg.slf4j.simpleLogger.logFile=System.out")
2323

24-
val scalajsReactComponentsVersion = "0.5.0"
24+
val scalajsReactComponentsVersion = "0.8.0"
25+
val scalacssVersion = "0.5.3"
26+
val pathsScalaJsVersion = "0.4.5"
2527

2628
val assetsDir = file("assets")
2729

@@ -41,7 +43,7 @@ lazy val treeMaterialUi = crossProject.in(file(".")).
4143
libraryDependencies ++= Seq(
4244
"org.rebeam" %%% "tree" % "0.1-SNAPSHOT",
4345

44-
"org.log4s" %% "log4s" % "1.2.1",
46+
"org.log4s" %% "log4s" % "1.3.3",
4547
"org.slf4j" % "slf4j-simple" % "1.7.21"
4648
),
4749
//For @Lenses
@@ -57,9 +59,9 @@ lazy val treeMaterialUi = crossProject.in(file(".")).
5759
).jsSettings(
5860
//Scalajs dependencies that are used on the client only
5961
libraryDependencies ++= Seq(
60-
"com.github.chandu0101.scalajs-react-components" %%% "core" % scalajsReactComponentsVersion,
61-
"com.github.japgolly.scalacss" %%% "ext-react" % "0.5.0",
62-
"eu.unicredit" %%% "paths-scala-js" % "0.4.5"
62+
"com.olvind" %%% "scalajs-react-components" % scalajsReactComponentsVersion,
63+
"com.github.japgolly.scalacss" %%% "ext-react" % scalacssVersion,
64+
"org.rebeam" %%% "paths-scala-js" % pathsScalaJsVersion
6365
),
6466

6567
crossTarget in (Compile, fullOptJS) := assetsDir,

jvm/src/main/scala/org/rebeam/tree/demo/ServerDemoApp.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import org.http4s.server.staticcontent._
1111
import org.http4s.server.websocket._
1212
import org.rebeam.tree.{DeltaIOContext, DeltaIOContextSource, Moment}
1313
import org.rebeam.tree.server.{ServerStore, ServerStoreValueExchange}
14-
import org.rebeam.tree.view.MaterialColor
1514
import org.rebeam.tree.Delta._
1615
import org.rebeam.tree.sync.Sync._
1716
import org.rebeam.tree.sync.DeltaIORun._

shared/src/main/scala/org/rebeam/tree/demo/DemoData.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ import org.rebeam.tree.sync._
1616
import org.rebeam.tree.sync.Sync._
1717
import cats.instances.list._
1818
import cats.syntax.traverse._
19-
import org.rebeam.tree.Searchable.notSearchable
20-
import shapeless.{::,HNil}
2119

2220
import scala.collection.mutable.ListBuffer
2321

shared/src/main/scala/org/rebeam/tree/demo/RefData.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import org.rebeam.tree.sync.Sync._
1111
import org.rebeam.tree.sync._
1212
import org.rebeam.tree.BasicDeltaDecoders._
1313
import cats.instances.list._
14-
import cats.instances.option._
1514
import cats.syntax.traverse._
1615

1716
import scala.collection.mutable.ListBuffer

shared/src/main/scala/org/rebeam/tree/demo/TaskData.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.rebeam.tree.demo
22

3-
import io.circe._
43
import io.circe.generic.JsonCodec
54
import org.rebeam.lenses.macros.Lenses
65
import org.rebeam.tree.Delta._

0 commit comments

Comments
 (0)