Skip to content

Commit 36416a9

Browse files
committed
Update dependencies
1 parent f8273d6 commit 36416a9

File tree

9 files changed

+26
-20
lines changed

9 files changed

+26
-20
lines changed

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ To create unpacked application:
99
sbt
1010
chromeUnpackedFast
1111
````
12-
You can find result in `./target/chrome/unpacked-fast` folder.
12+
You can find result in `./target/chrome/unpacked-fast` folder.
13+
After you install unpacked extension to Chrome, it can be found on `chrome://apps` page.

build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import net.lullabyte.{Chrome, ChromeSbtPlugin}
77
enablePlugins(ChromeSbtPlugin)
88

99
name := "System Monitor"
10-
version := "0.2.0"
11-
scalaVersion := "2.12.2"
10+
version := "0.2.1"
11+
scalaVersion := "2.12.4"
1212

1313

1414
addLibraries()

project/Dependencies.scala

+14-9
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ import sbt._
55
object Dependencies {
66

77
object versions {
8-
val scalacss = "0.5.3"
9-
val scalaReact = "1.0.0"
10-
val scalaChrome = "0.5.0"
8+
val scalacss = "0.5.6"
9+
val scalaReact = "1.4.2"
1110

12-
val react = "15.3.2"
11+
val react = "16.7.0"
1312
}
1413

1514
def addLibraries() = {
@@ -19,16 +18,22 @@ object Dependencies {
1918
"com.github.japgolly.scalajs-react" %%% "extra" % versions.scalaReact withSources() withJavadoc(),
2019
"com.github.japgolly.scalacss" %%% "core" % versions.scalacss withSources() withJavadoc(),
2120
"com.github.japgolly.scalacss" %%% "ext-react" % versions.scalacss withSources() withJavadoc(),
22-
"net.lullabyte" %%% "scala-js-chrome" % versions.scalaChrome withSources() withJavadoc()
21+
"net.lullabyte" %%% "scala-js-chrome" % "0.5.0" withSources() withJavadoc()
2322
)
2423
}
2524

2625
def addJsLibraries() = {
2726
jsDependencies ++= Seq(
28-
"org.webjars" % "react" % versions.react / "react-with-addons.js" commonJSName "React",
29-
"org.webjars" % "react" % versions.react / "react-dom.js" commonJSName "ReactDOM"
30-
dependsOn "react-with-addons.js"
31-
minified "react-dom.min.js"
27+
"org.webjars.npm" % "react" % versions.react
28+
/ "umd/react.development.js"
29+
minified "umd/react.production.min.js"
30+
commonJSName "React",
31+
32+
"org.webjars.npm" % "react-dom" % versions.react
33+
/ "umd/react-dom.development.js"
34+
minified "umd/react-dom.production.min.js"
35+
dependsOn "umd/react.development.js"
36+
commonJSName "ReactDOM"
3237
)
3338
}
3439
}

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 0.13.15
1+
sbt.version = 1.3.4

project/plugins.sbt

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
addSbtPlugin("net.lullabyte" % "sbt-chrome-plugin" % "0.5.0")
2-
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
1+
resolvers += Resolver.bintrayIvyRepo("veinhorn", "sbt-plugins")
2+
3+
addSbtPlugin("net.lullabyte" % "sbt-chrome-plugin" % "0.5.8")
4+
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")

scalastyle-config.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parameter name="maxFileLength"><![CDATA[800]]></parameter>
77
</parameters>
88
</check>
9-
<check level="warning" class="org.scalastyle.file.HeaderMatchesChecker" enabled="true">
9+
<check level="warning" class="org.scalastyle.file.HeaderMatchesChecker" enabled="false">
1010
<parameters>
1111
<parameter name="header"><![CDATA[// Copyright (C) 2011-2012 the original author or authors.
1212
// See the LICENCE.txt file distributed with this work for additional

src/main/scala/monitor/Timeline.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class Timeline[T](val sampleCount: Int, val sampleInterval: FiniteDuration)(fun:
5656

5757
private def tick(): Future[Unit] = for {
5858
sample <- fun
59-
_ <- Future.traverse(addSample(sample))(_.toFuture)
59+
_ <- Future.traverse(addSample(sample))(_.asAsyncCallback.unsafeToFuture())
6060
} yield ()
6161

6262

src/main/scala/monitor/modules/Memory.scala

-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ object Memory extends Module {
2626
class Backend[T](scope: BackendScope[Timeline[T], _]) extends Listener[Timeline[T]] {
2727

2828
def update(timeline: Timeline[T]): CallbackTo[Unit] = {
29-
println("Memory update")
30-
3129
scope.forceUpdate
3230
}
3331
}

src/main/scala/monitor/ui/components/SVGDiagram.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package monitor.ui.components
22

33
import japgolly.scalajs.react.ScalaComponent
44
import japgolly.scalajs.react.vdom.Implicits.{vdomAttrVtKey, vdomAttrVtString}
5-
import japgolly.scalajs.react.vdom.all.{backgroundColor, borderRadius, flex, svg, vdomElementFromTag}
5+
import japgolly.scalajs.react.vdom.all.{backgroundColor, borderRadius, flex, svg}
66
import japgolly.scalajs.react.vdom.{TagMod, TagOf, VdomElement}
77
import monitor.math.{Point, Rectangle}
88
import org.scalajs.dom.svg.G

0 commit comments

Comments
 (0)