raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

=pro,str Upgrade to Reactive Streams 1.0.1, unlocks #20241

Browse source
This commit is contained in:
Konrad `ktoso` Malawski 2017-07-10 21:40:12 +09:00
parent 14ef960f5e
commit 695861afd7
5 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala
View file

@ -18,7 +18,7 @@ abstract class AkkaIdentityProcessorVerification[T](env: TestEnvironment, publis
with TestNGSuiteLike with ActorSystemLifecycle {
def this(printlnDebug: Boolean) =
this(new TestEnvironment(Timeouts.defaultTimeoutMillis, printlnDebug), Timeouts.publisherShutdownTimeoutMillis)
this(new TestEnvironment(Timeouts.defaultTimeoutMillis, Timeouts.defaultNoSignalsTimeoutMillis, printlnDebug), Timeouts.publisherShutdownTimeoutMillis)
def this() = this(false)

2
akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala
View file

@ -16,7 +16,7 @@ abstract class AkkaPublisherVerification[T](val env: TestEnvironment, publisherS
with TestNGSuiteLike with ActorSystemLifecycle {
def this(printlnDebug: Boolean) =
this(new TestEnvironment(Timeouts.defaultTimeoutMillis, printlnDebug), Timeouts.publisherShutdownTimeoutMillis)
this(new TestEnvironment(Timeouts.defaultTimeoutMillis, Timeouts.defaultNoSignalsTimeoutMillis, printlnDebug), Timeouts.publisherShutdownTimeoutMillis)
def this() = this(false)

4
akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaSubscriberVerification.scala
View file

@ -16,7 +16,7 @@ abstract class AkkaSubscriberBlackboxVerification[T](env: TestEnvironment)
with AkkaSubscriberVerificationLike with ActorSystemLifecycle {
def this(printlnDebug: Boolean) =
this(new TestEnvironment(Timeouts.defaultTimeoutMillis, printlnDebug))
this(new TestEnvironment(Timeouts.defaultTimeoutMillis, Timeouts.defaultNoSignalsTimeoutMillis, printlnDebug))
def this() = this(false)
}
@ -26,7 +26,7 @@ abstract class AkkaSubscriberWhiteboxVerification[T](env: TestEnvironment)
with AkkaSubscriberVerificationLike {
def this(printlnDebug: Boolean) =
this(new TestEnvironment(Timeouts.defaultTimeoutMillis, printlnDebug))
this(new TestEnvironment(Timeouts.defaultTimeoutMillis, Timeouts.defaultNoSignalsTimeoutMillis, printlnDebug))
def this() = this(false)
}

2
akka-stream-tests-tck/src/test/scala/akka/stream/tck/Timeouts.scala
View file

@ -12,4 +12,6 @@ object Timeouts {
def defaultTimeoutMillis: Int = 800
def defaultNoSignalsTimeoutMillis: Int = 200
}

4
project/Dependencies.scala
View file

@ -60,7 +60,7 @@ object Dependencies {
val sigar = "org.fusesource" % "sigar" % "1.6.4" // ApacheV2
// reactive streams
val reactiveStreams = "org.reactivestreams" % "reactive-streams" % "1.0.0" // CC0
val reactiveStreams = "org.reactivestreams" % "reactive-streams" % "1.0.0" // CC0 // TODO update to 1.0.1 once it's released, we don't want to ship artifacts depending on RCs
// ssl-config
val sslConfigCore = "com.typesafe" %% "ssl-config-core" % sslConfigVersion // ApacheV2
@ -111,7 +111,7 @@ object Dependencies {
val slf4jLog4j = "org.slf4j" % "log4j-over-slf4j" % slf4jVersion % "test" // MIT
// reactive streams tck
val reactiveStreamsTck = "org.reactivestreams" % "reactive-streams-tck" % "1.0.0" % "test" // CC0
val reactiveStreamsTck = "org.reactivestreams" % "reactive-streams-tck" % "1.0.1-RC1" % "test" // CC0
}
object Provided {