Browse Source

Upgrade to Coroutines 1.3.0

Closes gh-23535
pull/23540/head
Sebastien Deleuze 6 years ago
parent
commit
77da40f006
  1. 2
      build.gradle
  2. 4
      spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java

2
build.gradle

@ -19,7 +19,7 @@ ext { @@ -19,7 +19,7 @@ ext {
moduleProjects = subprojects.findAll { it.name.startsWith("spring-") }
aspectjVersion = "1.9.4"
coroutinesVersion = "1.3.0-RC2"
coroutinesVersion = "1.3.0"
freemarkerVersion = "2.3.28"
groovyVersion = "2.5.7"
hsqldbVersion = "2.5.0"

4
spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java

@ -349,8 +349,8 @@ public class ReactiveAdapterRegistry { @@ -349,8 +349,8 @@ public class ReactiveAdapterRegistry {
registry.registerReactiveType(
ReactiveTypeDescriptor.multiValue(kotlinx.coroutines.flow.Flow.class, kotlinx.coroutines.flow.FlowKt::emptyFlow),
source -> kotlinx.coroutines.reactor.FlowKt.asFlux((kotlinx.coroutines.flow.Flow<?>) source),
kotlinx.coroutines.reactive.FlowKt::asFlow
source -> kotlinx.coroutines.reactor.ReactorFlowKt.asFlux((kotlinx.coroutines.flow.Flow<?>) source),
kotlinx.coroutines.reactive.ReactiveFlowKt::asFlow
);
}
}

Loading…
Cancel
Save