From 2a5be78db334112db737ff6ed3eae909fec71bb8 Mon Sep 17 00:00:00 2001 From: Nicolay Mitropolsky Date: Wed, 5 Jun 2019 17:27:46 +0300 Subject: [PATCH] Kotlinx-coroutines version set to `1.2.1` for IDEA 192 --- build.gradle.kts | 5 +++-- compiler/compiler.pro.192 | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9a52bc4ad6d..45e30ad1584 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -166,8 +166,9 @@ extra["versions.junit"] = "4.12" extra["versions.javaslang"] = "2.0.6" extra["versions.ant"] = "1.8.2" extra["versions.android"] = "2.3.1" -extra["versions.kotlinx-coroutines-core"] = "1.1.1" -extra["versions.kotlinx-coroutines-jdk8"] = "1.1.1" +val coroutinesVersion = if (Platform[192].orHigher()) "1.2.1" else "1.1.1" +extra["versions.kotlinx-coroutines-core"] = coroutinesVersion +extra["versions.kotlinx-coroutines-jdk8"] = coroutinesVersion extra["versions.json"] = "20160807" extra["versions.native-platform"] = "0.14" extra["versions.ant-launcher"] = "1.8.0" diff --git a/compiler/compiler.pro.192 b/compiler/compiler.pro.192 index ff6c9969e75..03c1ab31468 100644 --- a/compiler/compiler.pro.192 +++ b/compiler/compiler.pro.192 @@ -28,6 +28,7 @@ messages/**) -dontwarn com.intellij.util.SVGLoader -dontwarn com.intellij.util.SVGLoader$MyTranscoder -dontwarn com.intellij.util.ImageLoader$ImageDesc +-dontwarn kotlinx.coroutines.flow.FlowKt__MergeKt -dontwarn net.sf.cglib.** -dontwarn org.objectweb.asm.** # this is ASM3, the old version that we do not use -dontwarn com.sun.jna.NativeString