Skip to content

Commit 6d75f02

Browse files
committed
updating some versions
1 parent a78040c commit 6d75f02

File tree

7 files changed

+40
-43
lines changed

7 files changed

+40
-43
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
language: scala
22
before_script:
33
script:
4-
- echo "project bindings\n +compile" | sbt
5-
- echo "project plugin\n compile" | sbt
4+
- sbt +bindings/compile
5+
- sbt plugin/compile
66
- (cd examples; sbt chromeUnpackedOpt)
77
jdk:
88
- oraclejdk8

build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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.0"
62+
val circeVersion = "0.9.1"
6363
Seq(
6464
"io.circe" %% "circe-core" % circeVersion,
6565
"io.circe" %% "circe-generic" % circeVersion,
@@ -69,7 +69,7 @@ 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.21")
72+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.22")
7373
).
7474
enablePlugins(commonPlugins: _*)
7575

@@ -80,7 +80,7 @@ lazy val monixInterop = project.in(file("interop/monix")).
8080
scalaVersion := "2.12.4",
8181
crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.4"),
8282
libraryDependencies ++= Seq(
83-
"io.monix" %%% "monix" % "2.2.4"
83+
"io.monix" %%% "monix" % "2.3.3"
8484
),
8585
publishMavenStyle := true,
8686
publishTo := {
@@ -99,7 +99,7 @@ lazy val fs2Interop = project.in(file("interop/fs2")).
9999
scalaVersion := "2.12.4",
100100
crossScalaVersions := Seq("2.11.11", "2.12.4"),
101101
libraryDependencies ++= Seq(
102-
"co.fs2" %%% "fs2-core" % "0.9.7"
102+
"co.fs2" %%% "fs2-core" % "0.10.2"
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.2",
16+
scalaVersion := "2.12.4",
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.2",
61+
scalaVersion := "2.12.4",
6262
scalacOptions ++= Seq(
6363
"-language:implicitConversions",
6464
"-language:existentials",

examples/extension/src/main/scala/Main.scala

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
import scala.scalajs.js.JSApp
1+
object Main {
22

3-
object Main extends JSApp {
4-
5-
6-
def main(): Unit = {
3+
def main(args: Array[String]): Unit = {
74
println("Hello world!")
85
}
96

examples/project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
sbt.version = 0.13.13
1+
sbt.version = 1.1.0
22

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

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
package chrome.interop
22

33
import _root_.fs2._
4-
import _root_.fs2.util._
5-
import _root_.fs2.util.syntax._
64
import _root_.fs2.async.mutable.Queue
5+
import cats.effect.{Async, Effect, IO}
6+
import cats.effect.implicits._
7+
import cats.implicits._
78
import chrome.events.bindings.Event
89

10+
import scala.concurrent.ExecutionContext
911
import scala.language.higherKinds
10-
1112
import scala.scalajs.js
1213

1314
package object fs2 {
1415

1516
implicit class Event1FS2Ops[T1](val event: Event[js.Function1[T1, _]])
1617
extends AnyVal {
1718

18-
def single[F[_]: Async: Suspendable]: F[T1] =
19-
Async[F].async[T1] { callback =>
20-
Suspendable[F].delay {
19+
def single[F[_]: Effect]: F[T1] =
20+
Effect[F].async[T1] { callback =>
21+
Effect[F].delay {
2122
var fn = (t: T1) => ()
2223
fn = t => {
2324
event.removeListener(fn)
@@ -27,15 +28,15 @@ package object fs2 {
2728
}
2829
}
2930

30-
def toStream[F[_]: Async]: Stream[F, T1] =
31+
def toStream[F[_]: Effect](implicit EC: ExecutionContext): Stream[F, T1] =
3132
toStream(async.unboundedQueue[F, T1])
3233

33-
def toStream[F[_]: Async](queue: F[Queue[F, T1]]): Stream[F, T1] = {
34-
Stream.bracket{
34+
def toStream[F[_]: Effect](queue: F[Queue[F, T1]]): Stream[F, T1] = {
35+
Stream.bracket {
3536
queue.map { q =>
36-
val callback = (t: T1) => q.offer1(t).unsafeRunAsync(_ => ())
37+
val callback = (t: T1) => q.offer1(t).runAsync(_ => IO.unit).unsafeRunAsync(_ => ())
3738
event.addListener(callback)
38-
val release = Suspendable[F].delay(event.removeListener(callback))
39+
val release = Async[F].delay(event.removeListener(callback))
3940
(q, release)
4041
}
4142
}(_._1.dequeue, _._2)
@@ -46,9 +47,9 @@ package object fs2 {
4647
implicit class Event2FS2Ops[T1, T2](val event: Event[js.Function2[T1, T2, _]])
4748
extends AnyVal {
4849

49-
def single[F[_]: Async: Suspendable]: F[(T1, T2)] =
50-
Async[F].async[(T1, T2)] { callback =>
51-
Suspendable[F].delay {
50+
def single[F[_]: Effect]: F[(T1, T2)] =
51+
Effect[F].async[(T1, T2)] { callback =>
52+
Effect[F].delay {
5253
var fn = (t1: T1, t2: T2) => ()
5354
fn = (t1, t2) => {
5455
event.removeListener(fn)
@@ -58,15 +59,15 @@ package object fs2 {
5859
}
5960
}
6061

61-
def toStream[F[_]: Async]: Stream[F, (T1, T2)] =
62+
def toStream[F[_]: Effect](implicit EC: ExecutionContext): Stream[F, (T1, T2)] =
6263
toStream(async.unboundedQueue[F, (T1, T2)])
6364

64-
def toStream[F[_]: Async](queue: F[Queue[F, (T1, T2)]]): Stream[F, (T1, T2)] = {
65-
Stream.bracket{
65+
def toStream[F[_]: Effect](queue: F[Queue[F, (T1, T2)]]): Stream[F, (T1, T2)] = {
66+
Stream.bracket {
6667
queue.map { q =>
67-
val callback = (t1: T1, t2: T2) => q.offer1((t1, t2)).unsafeRunAsync(_ => ())
68+
val callback = (t1: T1, t2: T2) => q.offer1((t1, t2)).runAsync(_ => IO.unit).unsafeRunAsync(_ => ())
6869
event.addListener(callback)
69-
val release = Suspendable[F].delay(event.removeListener(callback))
70+
val release = Async[F].delay(event.removeListener(callback))
7071
(q, release)
7172
}
7273
}(_._1.dequeue, _._2)
@@ -77,9 +78,9 @@ package object fs2 {
7778
implicit class Event3FS2Ops[T1, T2, T3](val event: Event[js.Function3[T1, T2, T3, _]])
7879
extends AnyVal {
7980

80-
def single[F[_]: Async: Suspendable]: F[(T1, T2, T3)] =
81-
Async[F].async[(T1, T2, T3)] { callback =>
82-
Suspendable[F].delay {
81+
def single[F[_]: Effect]: F[(T1, T2, T3)] =
82+
Effect[F].async[(T1, T2, T3)] { callback =>
83+
Effect[F].delay {
8384
var fn = (t1: T1, t2: T2, t3: T3) => ()
8485
fn = (t1, t2, t3) => {
8586
event.removeListener(fn)
@@ -89,15 +90,15 @@ package object fs2 {
8990
}
9091
}
9192

92-
def toStream[F[_]: Async]: Stream[F, (T1, T2, T3)] =
93+
def toStream[F[_]: Effect](implicit EC: ExecutionContext): Stream[F, (T1, T2, T3)] =
9394
toStream(async.unboundedQueue[F, (T1, T2, T3)])
9495

95-
def toStream[F[_]: Async](queue: F[Queue[F, (T1, T2, T3)]]): Stream[F, (T1, T2, T3)] = {
96-
Stream.bracket{
96+
def toStream[F[_]: Effect](queue: F[Queue[F, (T1, T2, T3)]]): Stream[F, (T1, T2, T3)] = {
97+
Stream.bracket {
9798
queue.map { q =>
98-
val callback = (t1: T1, t2: T2, t3: T3) => q.offer1((t1, t2, t3)).unsafeRunAsync(_ => ())
99+
val callback = (t1: T1, t2: T2, t3: T3) => q.offer1((t1, t2, t3)).runAsync(_ => IO.unit).unsafeRunAsync(_ => ())
99100
event.addListener(callback)
100-
val release = Suspendable[F].delay(event.removeListener(callback))
101+
val release = Async[F].delay(event.removeListener(callback))
101102
(q, release)
102103
}
103104
}(_._1.dequeue, _._2)

project/plugins.sbt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.21")
1+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.22")
22
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
33
addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.2")
44
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
55
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3")
6-
addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.15")
76
resolvers += "sonatype-releases" at "https://oss.sonatype.org/content/repositories/releases/"

0 commit comments

Comments
 (0)