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

Upgraded plugin to 2.0.3, nightly to RC8 (bug fixes) (#27468)

Browse source
This commit is contained in:
Helena Edelson 2019-08-09 09:40:52 -07:00 • committed by GitHub
parent fb910a2b64
commit 2933de522b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.scalafmt.conf
View file

@ -1,4 +1,4 @@
version = 2.0.0-RC7
version = 2.0.0
style = defaultWithAlign

4
akka-stream/src/main/scala/akka/stream/impl/SubFlowImpl.scala
View file

@ -15,7 +15,7 @@ import language.higherKinds
* INTERNAL API
*/
@InternalApi private[akka] object SubFlowImpl {
trait MergeBack[In, F[+ _]] {
trait MergeBack[In, F[+_]] {
def apply[T](f: Flow[In, T, NotUsed], breadth: Int): F[T]
}
}
@ -23,7 +23,7 @@ import language.higherKinds
/**
* INTERNAL API
*/
@InternalApi private[akka] class SubFlowImpl[In, Out, Mat, F[+ _], C](
@InternalApi private[akka] class SubFlowImpl[In, Out, Mat, F[+_], C](
val subFlow: Flow[In, Out, NotUsed],
mergeBackFunction: SubFlowImpl.MergeBack[In, F],
finishFunction: Sink[In, NotUsed] => C)

2
akka-stream/src/main/scala/akka/stream/scaladsl/SubFlow.scala
View file

@ -13,7 +13,7 @@ import scala.annotation.unchecked.uncheckedVariance
* SubFlows cannot contribute to the super-flow’s materialized value since they
* are materialized later, during the runtime of the flow graph processing.
*/
trait SubFlow[+Out, +Mat, +F[+ _], C] extends FlowOps[Out, Mat] {
trait SubFlow[+Out, +Mat, +F[+_], C] extends FlowOps[Out, Mat] {
override type Repr[+T] = SubFlow[T, Mat @uncheckedVariance, F @uncheckedVariance, C @uncheckedVariance]
override type Closed = C

2
project/plugins.sbt
View file

@ -4,7 +4,7 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.4.0")
//#sbt-multi-jvm
addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.4.1")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.3")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.5")
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.4")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.3.0")