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

do not apply java plugin implicitly

Browse Source
This commit is contained in:
Nikita Skvortsov
2013-06-24 20:46:09 +04:00
parent 9695ce70a6
commit daa3b10e4d
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+9 -6
View File
@@ -31,7 +31,7 @@ open class KotlinPlugin: Plugin<Project> {
val javaBasePlugin = project.getPlugins().apply(javaClass<JavaBasePlugin>()) val javaBasePlugin = project.getPlugins().apply(javaClass<JavaBasePlugin>())
val javaPluginConvention = project.getConvention().getPlugin(javaClass<JavaPluginConvention>()) val javaPluginConvention = project.getConvention().getPlugin(javaClass<JavaPluginConvention>())
project.getPlugins().apply(javaClass<JavaPlugin>()) //project.getPlugins().apply(javaClass<JavaPlugin>())
configureSourceSetDefaults(project as ProjectInternal, javaBasePlugin, javaPluginConvention) configureSourceSetDefaults(project as ProjectInternal, javaBasePlugin, javaPluginConvention)
configureKDoc(project, javaPluginConvention) configureKDoc(project, javaPluginConvention)
@@ -82,12 +82,15 @@ open class KotlinPlugin: Plugin<Project> {
} }
private fun configureKDoc(project: Project, javaPluginConvention: JavaPluginConvention) { private fun configureKDoc(project: Project, javaPluginConvention: JavaPluginConvention) {
val mainSourceSet = javaPluginConvention.getSourceSets()?.getByName(SourceSet.MAIN_SOURCE_SET_NAME)!! as HasConvention val mainSourceSet = javaPluginConvention.getSourceSets()?.findByName(SourceSet.MAIN_SOURCE_SET_NAME) as HasConvention?
val kdoc = project.getTasks()?.add(KDOC_TASK_NAME, javaClass<KDoc>())!! if (mainSourceSet != null) {
kdoc.setDescription("Generates KDoc API documentation for the main source code.") val kdoc = project.getTasks()?.add(KDOC_TASK_NAME, javaClass<KDoc>())!!
kdoc.setGroup(JavaBasePlugin.DOCUMENTATION_GROUP)
kdoc.setSource(mainSourceSet.getConvention().getExtensionsAsDynamicObject().getProperty("kotlin")) kdoc.setDescription("Generates KDoc API documentation for the main source code.")
kdoc.setGroup(JavaBasePlugin.DOCUMENTATION_GROUP)
kdoc.setSource(mainSourceSet.getConvention().getExtensionsAsDynamicObject().getProperty("kotlin"))
}
project.getTasks()?.withType(javaClass<KDoc>(), object : Action<KDoc> { project.getTasks()?.withType(javaClass<KDoc>(), object : Action<KDoc> {
override fun execute(param: KDoc?) { override fun execute(param: KDoc?) {
libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/build.gradle
+4 -1
View File
@@ -10,7 +10,10 @@ buildscript {
} }
} }
apply plugin: org.jetbrains.kotlin.gradle.plugin.KotlinPlugin import org.jetbrains.kotlin.gradle.plugin.KotlinPlugin
apply plugin: KotlinPlugin
apply plugin: 'java'
sourceSets { sourceSets {
deploy deploy