From 34b55dbeb3a65b39b3585a646b5a0d2b1ce4dd96 Mon Sep 17 00:00:00 2001 From: Vladimir Ilmov Date: Wed, 19 Aug 2020 12:39:11 +0200 Subject: [PATCH] (CoroutineDebugger) Disable agent for MPP projects #KT-39412 fixed --- .../KotlinGradleCoroutineDebugProjectResolver.kt | 4 ++-- .../kotlin/idea/debugger/coroutine/DebuggerConnection.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleCoroutineDebugProjectResolver.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleCoroutineDebugProjectResolver.kt index 1473605ca65..7b2b2d7d89f 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleCoroutineDebugProjectResolver.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleCoroutineDebugProjectResolver.kt @@ -31,9 +31,9 @@ class KotlinGradleCoroutineDebugProjectResolver : AbstractProjectResolverExtensi if (task instanceof Test || task instanceof JavaExec) { def kotlinxCoroutinesCoreJar = task.classpath.find { it.name.startsWith("kotlinx-coroutines-core") } if (kotlinxCoroutinesCoreJar) { - def results = (kotlinxCoroutinesCoreJar.getName() =~ /kotlinx-coroutines-core[a-z\-]+(\d[\w\.\-]+)\.jar${'$'}/).findAll() + def results = (kotlinxCoroutinesCoreJar.getName() =~ /kotlinx-coroutines-core(\-jvm)?-(\d[\w\.\-]+)\.jar${'$'}/).findAll() if (results) { - def version = results.first()[1] + def version = results.first()[2] def referenceVersion = org.gradle.util.VersionNumber.parse('1.3.7-255') if (org.gradle.util.VersionNumber.parse(version) > referenceVersion) { task.jvmArgs ("-javaagent:${'$'}{kotlinxCoroutinesCoreJar?.absolutePath}", "-ea") diff --git a/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/DebuggerConnection.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/DebuggerConnection.kt index b314d723d5a..b4a919f3342 100644 --- a/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/DebuggerConnection.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/DebuggerConnection.kt @@ -57,7 +57,7 @@ class DebuggerConnection( } private fun determineCoreVersionMode(kotlinxCoroutinesCore: String): CoroutineDebuggerMode { - val regex = Regex(""".+\Wkotlinx-coroutines-core([\-a-z]+)(\d[\w\.\-]+)?\.jar""") + val regex = Regex(""".+\Wkotlinx-coroutines-core(\-jvm)?-(\d[\w\.\-]+)?\.jar""") val matchResult = regex.matchEntire(kotlinxCoroutinesCore) ?: return CoroutineDebuggerMode.DISABLED val versionToCompareTo = DefaultArtifactVersion("1.3.7-255")