Fixed getting a jar file from the classpath

Kotlin · Jun 10, 2022 · d8bc9e4 · d8bc9e4
1 parent 5b42bd7
commit d8bc9e4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/integration-testing/build.gradle b/integration-testing/build.gradle
@@ -71,20 +71,17 @@ task mavenTest(type: Test) {
 
 task debugAgentTest(type: Test) {
     def sourceSet = sourceSets.debugAgentTest
-    //dependsOn(project(':kotlinx-coroutines-debug').shadowJar)
-    def debugJar = null
-    sourceSet.runtimeClasspath.files.forEach {if (it.name.contains("kotlinx-coroutines-debug")) debugJar = it }
-    jvmArgs ('-javaagent:' + debugJar)
+    def coroutinesDebugJar = sourceSet.runtimeClasspath.filter {it.name == "kotlinx-coroutines-debug-${coroutines_version}.jar" }.singleFile
+    jvmArgs ('-javaagent:' + coroutinesDebugJar)
     testClassesDirs = sourceSet.output.classesDirs
     classpath = sourceSet.runtimeClasspath
     systemProperties project.properties.subMap(["overwrite.probes"])
 }
 
 task coreAgentTest(type: Test) {
     def sourceSet = sourceSets.coreAgentTest
-    def coreJar = null
-    sourceSet.runtimeClasspath.files.forEach {if (it.name.contains("kotlinx-coroutines-core")) coreJar = it }
-    jvmArgs ('-javaagent:' + coreJar)
+    def coroutinesCoreJar = sourceSet.runtimeClasspath.filter {it.name == "kotlinx-coroutines-core-jvm-${coroutines_version}.jar" }.singleFile
+    jvmArgs ('-javaagent:' + coroutinesCoreJar)
     testClassesDirs = sourceSet.output.classesDirs
     classpath = sourceSet.runtimeClasspath
 }
@@ -94,5 +91,5 @@ compileTestKotlin {
 }
 
 check {
-    dependsOn([mavenTest, coreAgentTest, ':smokeTest:build'])
+    dependsOn([mavenTest, debugAgentTest, coreAgentTest, 'smokeTest:build'])
 }
diff --git a/integration-test/build.gradle → integration-testing/smokeTest/build.gradle b/integration-test/build.gradle → integration-testing/smokeTest/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'kotlin-multiplatform'
+    id 'org.jetbrains.kotlin.multiplatform'
 }
 
 repositories {
@@ -40,4 +40,4 @@ kotlin {
             }
         }
     }
-}
+}