root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Upgrade to Coroutines 1.3.0 

Closes gh-23535
This commit is contained in:
Sebastien Deleuze 2019-08-28 13:30:40 +02:00
parent 52976246ac
commit 77da40f006
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -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
View File

@ -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
);
}
}