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

Merge pull request #635 from rusmonster/bugfix/fix-build-after-cleaning

Browse Source 
Build fails after project cleaning
#KT-7277 Fixed
This commit is contained in:
Natalia Ukhorskaya
2015-04-06 16:35:18 +03:00
parent cdc2d0f542 7c911e1f0a
commit 20470e5c42
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+4 -3
View File
@@ -398,13 +398,14 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler, val t
val basePlugin: BasePlugin = plugin as BasePlugin val basePlugin: BasePlugin = plugin as BasePlugin
val javaSources = project.files(javaSourceList) val javaSources = project.files(javaSourceList)
val androidRT = project.files(AndroidGradleWrapper.getRuntimeJars(basePlugin, androidExt)) 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) (it as AbstractCompile).setClasspath(fullClasspath)
val javacClassPath = javaTask.getClasspath() + project.files(kotlinTask.property("kotlinDestinationDir"))
javaTask.setClasspath(javacClassPath)
} }
javaTask.dependsOn(kotlinTaskName) javaTask.dependsOn(kotlinTaskName)
val javacClassPath = javaTask.getClasspath() + project.files(kotlinTask.property("kotlinDestinationDir"))
javaTask.setClasspath(javacClassPath)
} }
} }
} }