From 77da40f006c2eb6b1925d97ef09a94709ca6262e Mon Sep 17 00:00:00 2001 From: Sebastien Deleuze Date: Wed, 28 Aug 2019 13:30:40 +0200 Subject: [PATCH] Upgrade to Coroutines 1.3.0 Closes gh-23535 --- build.gradle | 2 +- .../org/springframework/core/ReactiveAdapterRegistry.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index adf961ec220..bc2cdc30024 100644 --- a/build.gradle +++ b/build.gradle @@ -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" diff --git a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java index d73881869f7..48c7512e628 100644 --- a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java +++ b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java @@ -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 ); } }