Upgraded to FS2 0.10.0-RC2

ccadllc · Jan 24, 2018 · e7c3bb6 · e7c3bb6
1 parent c932586
commit e7c3bb6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/build.sbt b/build.sbt
@@ -13,7 +13,7 @@ lazy val core = project.in(file("core")).enablePlugins(SbtOsgi).
     name := "circuitbreaker",
     libraryDependencies ++= Seq(
       "com.ccadllc.cedi" %% "config" % "1.1.0",
-      "co.fs2" %% "fs2-core" % "0.10.0-M10",
+      "co.fs2" %% "fs2-core" % "0.10.0-RC2",
       "org.scalatest" %% "scalatest" % "3.0.4" % "test"
     ),
     buildOsgiBundle("com.ccadllc.cedi.circuitbreaker"),

diff --git a/core/src/main/scala/com/ccadllc/cedi/circuitbreaker/CircuitBreakerRegistry.scala b/core/src/main/scala/com/ccadllc/cedi/circuitbreaker/CircuitBreakerRegistry.scala
@@ -181,7 +181,7 @@ object CircuitBreakerRegistry {
         _ <- state.modify(s => s.copy(circuitBreakers = s.circuitBreakers filterNot { case (id, _) => expiredIds.contains(id) }))
       } yield ()
       if (settings.garbageCollection.checkInterval > 0.nanoseconds) async.start(
-        scheduler.awakeEvery[F](settings.garbageCollection.checkInterval).evalMap { _ => collectGarbage }.interruptWhen(shutdownSignal).run.map { _ => () }
+        scheduler.awakeEvery[F](settings.garbageCollection.checkInterval).evalMap { _ => collectGarbage }.interruptWhen(shutdownSignal).compile.drain.map { _ => () }
       )
       else F.pure(())
     }

diff --git a/core/src/test/scala/com/ccadllc/cedi/circuitbreaker/TestSupport.scala b/core/src/test/scala/com/ccadllc/cedi/circuitbreaker/TestSupport.scala
@@ -109,7 +109,7 @@ trait TestSupport extends WordSpecLike with Matchers with BeforeAndAfterAll {
         case ClosedEvent(id, stats) => tseo.closed(id, stats)
         case ThrottledUpEvent(id, stats) => tseo.throttledUp(id, stats)
         case ThrottledDownEvent(id, stats) => tseo.throttledDown(id, stats)
-      }.drain.run.runAsync(_ => IO.unit).unsafeRunSync
+      }.compile.drain.runAsync(_ => IO.unit).unsafeRunSync
       tseo
     }
   }
@@ -149,7 +149,7 @@ trait TestSupport extends WordSpecLike with Matchers with BeforeAndAfterAll {
       registry.statistics(checkInterval).evalMap {
         case fs @ FailureStatistics(_, _, _, _, _, _) => tsso.add(fs)
         case fcs @ FlowControlStatistics(_, _, _, _) => tsso.add(fcs)
-      }.drain.run.runAsync { _ => IO.unit }.unsafeRunSync
+      }.compile.drain.runAsync { _ => IO.unit }.unsafeRunSync
       tsso
     }
   }