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

Gradle plugin: update to 1.1.0-rc1

Browse Source 
#KT-6729 Fixed
This commit is contained in:
Natalia Ukhorskaya
2015-02-05 16:27:36 +03:00
parent 97a54e88af
commit 360a496724
2 changed files with 6 additions and 2 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
+1 -1
View File
@@ -390,7 +390,7 @@ 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)) 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)) - project.files(kotlinTask.property("kotlinDestinationDir"))
(it as AbstractCompile).setClasspath(fullClasspath) (it as AbstractCompile).setClasspath(fullClasspath)
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/android/AndroidGradleWrapper.groovy
+5 -1
View File
@@ -1,5 +1,6 @@
package org.jetbrains.kotlin.gradle.plugin.android package org.jetbrains.kotlin.gradle.plugin.android
import com.android.build.gradle.BaseExtension
import com.android.build.gradle.BasePlugin import com.android.build.gradle.BasePlugin
import com.android.build.gradle.api.ApkVariant import com.android.build.gradle.api.ApkVariant
import com.android.build.gradle.api.BaseVariant import com.android.build.gradle.api.BaseVariant
@@ -7,10 +8,13 @@ import org.gradle.api.tasks.util.PatternFilterable
import org.jetbrains.annotations.NotNull import org.jetbrains.annotations.NotNull
class AndroidGradleWrapper { class AndroidGradleWrapper {
static def getRuntimeJars(BasePlugin basePlugin) { static def getRuntimeJars(BasePlugin basePlugin, BaseExtension baseExtension) {
if (basePlugin.getMetaClass().getMetaMethod("getRuntimeJarList")) { if (basePlugin.getMetaClass().getMetaMethod("getRuntimeJarList")) {
return basePlugin.getRuntimeJarList() return basePlugin.getRuntimeJarList()
} }
else if (baseExtension.getMetaClass().getMetaMethod("getBootClasspath")) {
return baseExtension.getBootClasspath()
}
else { else {
return basePlugin.getBootClasspath() return basePlugin.getBootClasspath()
} }