Merge pull request #635 from rusmonster/bugfix/fix-build-after-cleaning
Build fails after project cleaning #KT-7277 Fixed
This commit is contained in:
+4
-3
@@ -398,13 +398,14 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler, val t
|
||||
val basePlugin: BasePlugin = plugin as BasePlugin
|
||||
val javaSources = project.files(javaSourceList)
|
||||
val androidRT = project.files(AndroidGradleWrapper.getRuntimeJars(basePlugin, androidExt))
|
||||
val fullClasspath = (javaTask.getClasspath() + (javaSources + androidRT)) - project.files(kotlinTask.property("kotlinDestinationDir"))
|
||||
val fullClasspath = javaTask.getClasspath() + (javaSources + androidRT)
|
||||
(it as AbstractCompile).setClasspath(fullClasspath)
|
||||
|
||||
val javacClassPath = javaTask.getClasspath() + project.files(kotlinTask.property("kotlinDestinationDir"))
|
||||
javaTask.setClasspath(javacClassPath)
|
||||
}
|
||||
|
||||
javaTask.dependsOn(kotlinTaskName)
|
||||
val javacClassPath = javaTask.getClasspath() + project.files(kotlinTask.property("kotlinDestinationDir"))
|
||||
javaTask.setClasspath(javacClassPath)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user