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

Fixes after review

Browse Source
This commit is contained in:
Ilya Chernikov
2018-01-15 12:49:50 +01:00
committed by Vyacheslav Gerasimov
parent 14e586d5a5
commit 058ef31d7a
15 changed files with 41 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-extensions/android-extensions-jps/src/KotlinAndroidJpsPlugin.kt
+1 -2
View File
@@ -62,7 +62,6 @@ class KotlinAndroidJpsPlugin : KotlinJpsCompilerArgumentsProvider {
val module = moduleBuildTarget.module
if (!hasAndroidJpsPlugin() || !isAndroidModuleWithoutGradle(module)) return emptyList()
val inJar = File(PathUtil.getJarPathForClass(this::class.java)).isFile
val manifestFile = getAndroidManifest(moduleBuildTarget.module)
return if (manifestFile != null) {
@@ -74,7 +73,7 @@ class KotlinAndroidJpsPlugin : KotlinJpsCompilerArgumentsProvider {
compilerPluginJar = File("dist/kotlinc/lib/$JAR_FILE_NAME")
} else {
// Inside Kotlin/jps directory (Kotlin plugin)
val libDirectory = File(PathUtil.getJarPathForClass(this::class.java)).parentFile.parentFile
val libDirectory = jpsPluginJar.parentFile.parentFile
compilerPluginJar = File(libDirectory, JAR_FILE_NAME)
}