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

Android Extensions: Fix Android JPS plugin

Browse Source
This commit is contained in:
Yan Zhulanow
2015-11-26 18:31:31 +03:00
parent 2cbf9d7e9b
commit e39ca63bcc
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-jps-plugin/src/KotlinAndroidJpsPlugin.kt
+3 -3
View File
@@ -29,7 +29,7 @@ import javax.xml.parsers.DocumentBuilderFactory
public class KotlinAndroidJpsPlugin : KotlinJpsCompilerArgumentsProvider {
override fun getExtraArguments(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List<String> {
val module = moduleBuildTarget.module
if (!hasAndroidJpsPlugin() || isAndroidModuleWithoutGradle(module)) return emptyList()
if (!hasAndroidJpsPlugin() || !isAndroidModuleWithoutGradle(module)) return emptyList()
val pluginId = ANDROID_COMPILER_PLUGIN_ID
val resPath = getAndroidResPath(module)
@@ -60,7 +60,7 @@ public class KotlinAndroidJpsPlugin : KotlinJpsCompilerArgumentsProvider {
override fun getClasspath(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List<String> {
val module = moduleBuildTarget.module
if (!hasAndroidJpsPlugin() || isAndroidModuleWithoutGradle(module)) return emptyList()
if (!hasAndroidJpsPlugin() || !isAndroidModuleWithoutGradle(module)) return emptyList()
val inJar = File(PathUtil.getJarPathForClass(javaClass)).isFile
val manifestFile = getAndroidManifest(moduleBuildTarget.module)
@@ -91,7 +91,7 @@ public class KotlinAndroidJpsPlugin : KotlinJpsCompilerArgumentsProvider {
companion object {
private val ANDROID_JPS_UTIL_CLASS_FQNAME = "org.jetbrains.jps.android.AndroidJpsUtil"
private val JAR_FILE_NAME = "android-compiler-plugin.jar"
private val JAR_FILE_NAME = "kotlin-android-extensions-compiler-plugin.jar"
private val ANDROID_COMPILER_PLUGIN_ID = "org.jetbrains.kotlin.android"
private val VARIANT_OPTION_NAME = "variant"