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

Fix jps android test

Browse Source
This commit is contained in:
Yan Zhulanow
2017-12-01 17:10:31 +01:00
committed by Vyacheslav Gerasimov
parent 46be5e25be
commit 59c8f33450
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-extensions/android-extensions-jps/src/KotlinAndroidJpsPlugin.kt
+14 -8
View File
@@ -64,15 +64,21 @@ class KotlinAndroidJpsPlugin : KotlinJpsCompilerArgumentsProvider {
val inJar = File(PathUtil.getJarPathForClass(this::class.java)).isFile
val manifestFile = getAndroidManifest(moduleBuildTarget.module)
return if (manifestFile != null) {
listOf(
if (inJar) {
val libDirectory = File(PathUtil.getJarPathForClass(this::class.java)).parentFile.parentFile
File(libDirectory, JAR_FILE_NAME).absolutePath
} else {
// We're in tests now (project root dir)
File("dist/kotlinc/lib/$JAR_FILE_NAME").absolutePath
})
val jpsPluginJar = File(PathUtil.getJarPathForClass(this::class.java))
val compilerPluginJar: File
if (jpsPluginJar.parentFile?.name == "libs" && jpsPluginJar.parentFile?.parentFile?.name == "build") {
// We're in tests now (inside plugins/android-extensions/android-extensions-jps/build/libs)
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
compilerPluginJar = File(libDirectory, JAR_FILE_NAME)
}
listOf(compilerPluginJar.absolutePath)
}
else emptyList()
}