Skip to content

Commit 3dcca74

Browse files
committed
Fixed getting a jar file from the classpath
1 parent 0aca6d0 commit 3dcca74

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

integration-testing/build.gradle

+5-8
Original file line numberDiff line numberDiff line change
@@ -71,20 +71,17 @@ task mavenTest(type: Test) {
7171

7272
task debugAgentTest(type: Test) {
7373
def sourceSet = sourceSets.debugAgentTest
74-
//dependsOn(project(':kotlinx-coroutines-debug').shadowJar)
75-
def debugJar = null
76-
sourceSet.runtimeClasspath.files.forEach {if (it.name.contains("kotlinx-coroutines-debug")) debugJar = it }
77-
jvmArgs ('-javaagent:' + debugJar)
74+
def coroutinesDebugJar = sourceSet.runtimeClasspath.filter {it.name == "kotlinx-coroutines-debug-${coroutines_version}.jar" }.singleFile
75+
jvmArgs ('-javaagent:' + coroutinesDebugJar)
7876
testClassesDirs = sourceSet.output.classesDirs
7977
classpath = sourceSet.runtimeClasspath
8078
systemProperties project.properties.subMap(["overwrite.probes"])
8179
}
8280

8381
task coreAgentTest(type: Test) {
8482
def sourceSet = sourceSets.coreAgentTest
85-
def coreJar = null
86-
sourceSet.runtimeClasspath.files.forEach {if (it.name.contains("kotlinx-coroutines-core")) coreJar = it }
87-
jvmArgs ('-javaagent:' + coreJar)
83+
def coroutinesCoreJar = sourceSet.runtimeClasspath.filter {it.name == "kotlinx-coroutines-core-jvm-${coroutines_version}.jar" }.singleFile
84+
jvmArgs ('-javaagent:' + coroutinesCoreJar)
8885
testClassesDirs = sourceSet.output.classesDirs
8986
classpath = sourceSet.runtimeClasspath
9087
}
@@ -94,5 +91,5 @@ compileTestKotlin {
9491
}
9592

9693
check {
97-
dependsOn([mavenTest, coreAgentTest, ':smokeTest:build'])
94+
dependsOn([mavenTest, debugAgentTest, coreAgentTest, 'smokeTest:build'])
9895
}

integration-test/build.gradle renamed to integration-testing/smokeTest/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'kotlin-multiplatform'
2+
id 'org.jetbrains.kotlin.multiplatform'
33
}
44

55
repositories {
@@ -40,4 +40,4 @@ kotlin {
4040
}
4141
}
4242
}
43-
}
43+
}

0 commit comments

Comments
 (0)