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

Allow using Kotlin without explicit 'java' plugin

Browse Source
This commit is contained in:
Nikita Skvortsov
2013-07-08 22:23:52 +04:00
parent 0bb6dde60c
commit 9bd3619fb8
1 changed files with 2 additions and 1 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
+2 -1
View File
@@ -32,6 +32,7 @@ import com.android.build.gradle.api.ApkVariant
import com.android.builder.model.BuildType import com.android.builder.model.BuildType
import com.android.builder.BuilderConstants import com.android.builder.BuilderConstants
import com.android.build.gradle.api.TestVariant import com.android.build.gradle.api.TestVariant
import org.gradle.api.plugins.JavaPlugin
open class KotlinPlugin: Plugin<Project> { open class KotlinPlugin: Plugin<Project> {
@@ -39,7 +40,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)