From 1a1148b0d03aca9acdd336a4b8050d1a67ea59e6 Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Tue, 8 Aug 2017 12:52:03 +0700 Subject: [PATCH] gradle-plugin: Set groups and descriptions for building tasks Issue link: https://github.com/JetBrains/kotlin-native/issues/771 --- .../jetbrains/kotlin/gradle/plugin/KonanCompileTask.kt | 8 ++++++-- .../jetbrains/kotlin/gradle/plugin/KonanInteropTask.kt | 5 +++++ .../org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt | 3 +++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileTask.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileTask.kt index 0ecb0178f39..1cbbc9ab731 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileTask.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileTask.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.gradle.plugin import org.gradle.api.Named import org.gradle.api.Project import org.gradle.api.file.FileCollection +import org.gradle.api.plugins.BasePlugin import org.gradle.api.tasks.* import java.io.File @@ -194,8 +195,11 @@ open class KonanCompileConfig( val compilationTask: KonanCompileTask = project.tasks.create( "$taskNamePrefix${configName.capitalize()}", - KonanCompileTask::class.java - ) { it.init(this@KonanCompileConfig.name) } + KonanCompileTask::class.java) { + it.init(this@KonanCompileConfig.name) + it.group = BasePlugin.BUILD_GROUP + it.description = "Compiles the Kotlin/Native artifact '${this@KonanCompileConfig.name}'" + } // DSL methods -------------------------------------------------- diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanInteropTask.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanInteropTask.kt index 2bbc9e8ca32..bdcc3269b1e 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanInteropTask.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanInteropTask.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.gradle.plugin import org.gradle.api.Named import org.gradle.api.Project import org.gradle.api.file.FileCollection +import org.gradle.api.plugins.BasePlugin import org.gradle.api.tasks.* import java.io.File @@ -157,6 +158,8 @@ open class KonanInteropConfig( KonanInteropTask::class.java) { it.init(name) it.manifest = "${it.stubsDir.path}/manifest.properties" + it.group = BasePlugin.BUILD_GROUP + it.description = "Generates stubs for the Kotlin/Native interop '$name'" } // Config and task to compile *.kt stubs into a library internal val compileStubsConfig = KonanCompileConfig("${name}InteropStubs", project, "compile").apply { @@ -165,6 +168,8 @@ open class KonanInteropConfig( produce("library") inputFiles(project.fileTree(generateStubsTask.stubsDir).apply { builtBy(generateStubsTask) }) manifest("${generateStubsTask.stubsDir.path}/manifest.properties") + compilationTask.group = BasePlugin.BUILD_GROUP + compilationTask.description = "Compiles stubs for the Kotlin/Native interop '${this@KonanInteropConfig.name}'" } val compileStubsTask = compileStubsConfig.compilationTask diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt index 5cfec278dbe..4225ce23b8c 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.gradle.plugin import org.gradle.api.* import org.gradle.api.file.FileCollection +import org.gradle.api.plugins.BasePlugin import org.gradle.api.tasks.TaskCollection import org.gradle.tooling.provider.model.ToolingModelBuilderRegistry import java.util.* @@ -265,6 +266,8 @@ class KonanPlugin @Inject constructor(private val registry: ToolingModelBuilderR // Create and set up aggregate building tasks. val compileKonanTask = project.getOrCreateTask("compileKonan").apply { dependsOn(project.supportedCompileTasks) + group = BasePlugin.BUILD_GROUP + description = "Compiles all the Kotlin/Native artifacts supported" } project.getTask("build").apply { dependsOn(compileKonanTask)