Skip to content

Commit bf1034c

Browse files
guersamlucidd
guersam
authored and
lucidd
committed
Bump dependencies
- scala 2.12.7 - scala.js 0.6.25 - cats 1.4.0, cats-effect 1.0.0 - fs2 1.0.0 - monix 3.0.0-RC2 - circe 0.10.1 - sbt 1.2.6 - sbt plugins (only minor updates)
1 parent 94ed9fc commit bf1034c

File tree

5 files changed

+33
-39
lines changed

5 files changed

+33
-39
lines changed

‎build.sbt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ lazy val bindings = project.in(file("bindings"))
3636
.settings(commonSettings: _*)
3737
.settings(
3838
name := "scala-js-chrome",
39-
scalaVersion := "2.12.6",
40-
crossScalaVersions := Seq("2.10.6", "2.11.12", "2.12.6"),
39+
scalaVersion := "2.12.7",
40+
crossScalaVersions := Seq("2.10.6", "2.11.12", "2.12.7"),
4141
libraryDependencies ++= Seq(
4242
"org.scala-js" %%% "scalajs-dom" % "0.9.6"
4343
),
@@ -59,7 +59,7 @@ lazy val plugin = project.in(file("sbt-plugin")).
5959
sbtPlugin := true,
6060
name := "sbt-chrome-plugin",
6161
libraryDependencies ++= {
62-
val circeVersion = "0.9.1"
62+
val circeVersion = "0.10.1"
6363
Seq(
6464
"io.circe" %% "circe-core" % circeVersion,
6565
"io.circe" %% "circe-generic" % circeVersion,
@@ -69,18 +69,18 @@ lazy val plugin = project.in(file("sbt-plugin")).
6969
publishMavenStyle := false,
7070
bintrayRepository := "sbt-plugins",
7171
bintrayOrganization := None,
72-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.24")
72+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.25")
7373
).
7474
enablePlugins(commonPlugins: _*)
7575

7676
lazy val monixInterop = project.in(file("interop/monix")).
7777
settings(commonSettings: _*).
7878
settings(
7979
name := "scala-js-chrome-monix",
80-
scalaVersion := "2.12.6",
81-
crossScalaVersions := Seq("2.10.6", "2.11.12", "2.12.6"),
80+
scalaVersion := "2.12.7",
81+
crossScalaVersions := Seq("2.10.6", "2.11.12", "2.12.7"),
8282
libraryDependencies ++= Seq(
83-
"io.monix" %%% "monix" % "2.3.3"
83+
"io.monix" %%% "monix" % "3.0.0-RC2"
8484
),
8585
publishMavenStyle := true,
8686
publishTo := {
@@ -96,10 +96,10 @@ lazy val fs2Interop = project.in(file("interop/fs2")).
9696
settings(commonSettings: _*).
9797
settings(
9898
name := "scala-js-chrome-fs2",
99-
scalaVersion := "2.12.6",
100-
crossScalaVersions := Seq("2.11.12", "2.12.6"),
99+
scalaVersion := "2.12.7",
100+
crossScalaVersions := Seq("2.11.12", "2.12.7"),
101101
libraryDependencies ++= Seq(
102-
"co.fs2" %%% "fs2-core" % "0.10.5"
102+
"co.fs2" %%% "fs2-core" % "1.0.0"
103103
),
104104
publishMavenStyle := true,
105105
publishTo := {

‎examples/build.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ lazy val exampleApp = project.in(file("app"))
1313
.settings(
1414
name := "Example App",
1515
version := "0.1.0",
16-
scalaVersion := "2.12.6",
16+
scalaVersion := "2.12.7",
1717
scalacOptions ++= Seq(
1818
"-language:implicitConversions",
1919
"-language:existentials",
@@ -58,7 +58,7 @@ lazy val extension = project.in(file("extension"))
5858
.settings(
5959
name := "Example Extension",
6060
version := "0.1.0",
61-
scalaVersion := "2.12.6",
61+
scalaVersion := "2.12.7",
6262
scalacOptions ++= Seq(
6363
"-language:implicitConversions",
6464
"-language:existentials",

‎interop/fs2/src/main/scala/chrome/interop/fs2/package.scala‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package chrome.interop
22

33
import _root_.fs2._
4-
import _root_.fs2.async.mutable.Queue
5-
import cats.effect.{Async, Effect, IO}
4+
import _root_.fs2.concurrent.Queue
5+
import cats.effect.{Async, Concurrent, Effect, IO}
66
import cats.effect.implicits._
77
import cats.implicits._
88
import chrome.events.bindings.Event
99

10-
import scala.concurrent.ExecutionContext
1110
import scala.language.higherKinds
1211
import scala.scalajs.js
1312

@@ -28,20 +27,18 @@ package object fs2 {
2827
}
2928
}
3029

31-
def toStream[F[_]: Effect](implicit EC: ExecutionContext): Stream[F, T1] =
32-
toStream(async.unboundedQueue[F, T1])
30+
def toStream[F[_]: Effect: Concurrent]: Stream[F, T1] =
31+
toStream(Queue.unbounded[F, T1])
3332

34-
def toStream[F[_]: Effect](queue: F[Queue[F, T1]]): Stream[F, T1] = {
33+
def toStream[F[_]: Effect](queue: F[Queue[F, T1]]): Stream[F, T1] =
3534
Stream.bracket {
3635
queue.map { q =>
37-
val callback = (t: T1) => q.offer1(t).runAsync(_ => IO.unit).unsafeRunAsync(_ => ())
36+
val callback = (t: T1) => q.offer1(t).runAsync(_ => IO.unit).unsafeRunSync
3837
event.addListener(callback)
3938
val release = Async[F].delay(event.removeListener(callback))
4039
(q, release)
4140
}
42-
}(_._1.dequeue, _._2)
43-
}
44-
41+
}(_._2).flatMap(_._1.dequeue)
4542
}
4643

4744
implicit class Event2FS2Ops[T1, T2](val event: Event[js.Function2[T1, T2, _]])
@@ -59,20 +56,18 @@ package object fs2 {
5956
}
6057
}
6158

62-
def toStream[F[_]: Effect](implicit EC: ExecutionContext): Stream[F, (T1, T2)] =
63-
toStream(async.unboundedQueue[F, (T1, T2)])
59+
def toStream[F[_]: Effect: Concurrent]: Stream[F, (T1, T2)] =
60+
toStream(Queue.unbounded[F, (T1, T2)])
6461

65-
def toStream[F[_]: Effect](queue: F[Queue[F, (T1, T2)]]): Stream[F, (T1, T2)] = {
62+
def toStream[F[_]: Effect](queue: F[Queue[F, (T1, T2)]]): Stream[F, (T1, T2)] =
6663
Stream.bracket {
6764
queue.map { q =>
68-
val callback = (t1: T1, t2: T2) => q.offer1((t1, t2)).runAsync(_ => IO.unit).unsafeRunAsync(_ => ())
65+
val callback = (t1: T1, t2: T2) => q.offer1((t1, t2)).runAsync(_ => IO.unit).unsafeRunSync
6966
event.addListener(callback)
7067
val release = Async[F].delay(event.removeListener(callback))
7168
(q, release)
7269
}
73-
}(_._1.dequeue, _._2)
74-
}
75-
70+
}(_._2).flatMap(_._1.dequeue)
7671
}
7772

7873
implicit class Event3FS2Ops[T1, T2, T3](val event: Event[js.Function3[T1, T2, T3, _]])
@@ -90,19 +85,18 @@ package object fs2 {
9085
}
9186
}
9287

93-
def toStream[F[_]: Effect](implicit EC: ExecutionContext): Stream[F, (T1, T2, T3)] =
94-
toStream(async.unboundedQueue[F, (T1, T2, T3)])
88+
def toStream[F[_]: Effect: Concurrent]: Stream[F, (T1, T2, T3)] =
89+
toStream(Queue.unbounded[F, (T1, T2, T3)])
9590

96-
def toStream[F[_]: Effect](queue: F[Queue[F, (T1, T2, T3)]]): Stream[F, (T1, T2, T3)] = {
91+
def toStream[F[_]: Effect](queue: F[Queue[F, (T1, T2, T3)]]): Stream[F, (T1, T2, T3)] =
9792
Stream.bracket {
9893
queue.map { q =>
99-
val callback = (t1: T1, t2: T2, t3: T3) => q.offer1((t1, t2, t3)).runAsync(_ => IO.unit).unsafeRunAsync(_ => ())
94+
val callback = (t1: T1, t2: T2, t3: T3) => q.offer1((t1, t2, t3)).runAsync(_ => IO.unit).unsafeRunSync
10095
event.addListener(callback)
10196
val release = Async[F].delay(event.removeListener(callback))
10297
(q, release)
10398
}
104-
}(_._1.dequeue, _._2)
105-
}
99+
}(_._2).flatMap(_._1.dequeue)
106100

107101
}
108102

‎project/build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 1.2.1
1+
sbt.version = 1.2.6

‎project/plugins.sbt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.24")
1+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.25")
22
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
3-
addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.2")
4-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
3+
addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.4")
4+
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
55
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3")
66
resolvers += "sonatype-releases" at "https://oss.sonatype.org/content/repositories/releases/"

0 commit comments

Comments
 (0)