azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IDEA] Check assignable from task to KotlinTest class

Browse Source
This commit is contained in:
Ilya Goncharov
2020-01-24 11:52:36 +03:00
parent 6b860206bd
commit 6dc9109736
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinNonJvmGutterConfigurator.kt
+22 -20
View File
@@ -24,29 +24,31 @@ class KotlinNonJvmGutterConfigurator : AbstractProjectResolverExtension() {
// ignore, class not available // ignore, class not available
} }
gradle.afterProject { project -> if (kotlinTestClass != null) {
// Test task should have some parameters gradle.afterProject { project ->
// Create dummy task to consume outputs by Test task // Test task should have some parameters
project.tasks.create("nonJvmTestIdeSupportDummy") // Create dummy task to consume outputs by Test task
project.tasks.create("nonJvmTestIdeSupportDummy")
// IDEA now process filter parameters only for Test tasks
project.tasks.create('nonJvmTestIdeSupport', Test) { // IDEA now process filter parameters only for Test tasks
testClassesDirs = project.tasks["nonJvmTestIdeSupportDummy"].outputs.files project.tasks.create('nonJvmTestIdeSupport', Test) {
classpath = project.tasks["nonJvmTestIdeSupportDummy"].outputs.files testClassesDirs = project.tasks["nonJvmTestIdeSupportDummy"].outputs.files
} classpath = project.tasks["nonJvmTestIdeSupportDummy"].outputs.files
}
project.afterEvaluate {
project.tasks.each { Task task -> project.afterEvaluate {
if (kotlinTestClass != null) { project.tasks.each { Task task ->
task.dependsOn('nonJvmTestIdeSupport') if (kotlinTestClass.isAssignableFrom(task.class)) {
task.dependsOn('nonJvmTestIdeSupport')
}
} }
} }
} }
}
gradle.taskGraph.beforeTask { Task task ->
gradle.taskGraph.beforeTask { Task task -> if (kotlinTestClass.isAssignableFrom(task.class)) {
if (kotlinTestClass != null) { task.filter.includePatterns = task.project.tasks['nonJvmTestIdeSupport'].filter.includePatterns
task.filter.includePatterns = task.project.tasks['nonJvmTestIdeSupport'].filter.includePatterns }
} }
} }
} }