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

Kapt: Make javaCompile parameter in KotlinGradleSubplugin non-null

Browse Source 
(cherry picked from commit 9686344)
This commit is contained in:
Yan Zhulanow
2016-08-12 03:45:58 +03:00
committed by Yan Zhulanow
parent 46f9e02c06
commit b13db88e6f
5 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/examples/kotlin-gradle-subplugin-example/src/main/kotlin/example/ExampleSubplugin.kt
+1 -1
View File
@@ -31,7 +31,7 @@ class ExampleSubplugin : KotlinGradleSubplugin {
override fun apply( override fun apply(
project: Project, project: Project,
kotlinCompile: AbstractCompile, kotlinCompile: AbstractCompile,
javaCompile: AbstractCompile?, javaCompile: AbstractCompile,
variantData: Any?, variantData: Any?,
javaSourceSet: SourceSet? javaSourceSet: SourceSet?
): List<SubpluginOption> { ): List<SubpluginOption> {
libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleSubplugin.kt
+1 -1
View File
@@ -28,7 +28,7 @@ interface KotlinGradleSubplugin {
fun apply( fun apply(
project: Project, project: Project,
kotlinCompile: AbstractCompile, kotlinCompile: AbstractCompile,
javaCompile: AbstractCompile?, javaCompile: AbstractCompile,
variantData: Any?, variantData: Any?,
javaSourceSet: SourceSet? javaSourceSet: SourceSet?
): List<SubpluginOption> ): List<SubpluginOption>
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AndroidSubplugin.kt
+1 -1
View File
@@ -62,7 +62,7 @@ class AndroidSubplugin : KotlinGradleSubplugin {
override fun apply( override fun apply(
project: Project, project: Project,
kotlinCompile: AbstractCompile, kotlinCompile: AbstractCompile,
javaCompile: AbstractCompile?, javaCompile: AbstractCompile,
variantData: Any?, variantData: Any?,
javaSourceSet: SourceSet? javaSourceSet: SourceSet?
): List<SubpluginOption> { ): List<SubpluginOption> {
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/Kapt2KotlinGradleSubplugin.kt
+2 -2
View File
@@ -61,8 +61,8 @@ class Kapt2KotlinGradleSubplugin : KotlinGradleSubplugin {
override fun apply( override fun apply(
project: Project, project: Project,
kotlinCompile: AbstractCompile, kotlinCompile: AbstractCompile,
javaCompile: AbstractCompile?, javaCompile: AbstractCompile,
variantData: Any?, variantData: Any?,
javaSourceSet: SourceSet? javaSourceSet: SourceSet?
): List<SubpluginOption> { ): List<SubpluginOption> {
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+2 -4
View File
@@ -131,10 +131,8 @@ class Kotlin2JvmSourceSetProcessor(
val subpluginEnvironment = loadSubplugins(project) val subpluginEnvironment = loadSubplugins(project)
subpluginEnvironment.addSubpluginArguments(project, kotlinTask, subpluginEnvironment.addSubpluginArguments(project, kotlinTask,
javaTask as? AbstractCompile, null, sourceSet) javaTask as JavaCompile, null, sourceSet)
if (javaTask !is JavaCompile) return@afterEvaluate
var kotlinAfterJavaTask: KotlinCompile? = null var kotlinAfterJavaTask: KotlinCompile? = null
if (aptConfiguration.dependencies.size > 1 && !Kapt2GradleSubplugin.isEnabled(project)) { if (aptConfiguration.dependencies.size > 1 && !Kapt2GradleSubplugin.isEnabled(project)) {
@@ -490,7 +488,7 @@ class SubpluginEnvironment(
fun addSubpluginArguments( fun addSubpluginArguments(
project: Project, project: Project,
kotlinTask: KotlinCompile, kotlinTask: KotlinCompile,
javaTask: AbstractCompile?, javaTask: AbstractCompile,
variantData: Any?, variantData: Any?,
javaSourceSet: SourceSet?) { javaSourceSet: SourceSet?) {
val pluginOptions = kotlinTask.pluginOptions val pluginOptions = kotlinTask.pluginOptions