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

Support test case execution in KotlinAndroidJpsPlugin

Browse Source
This commit is contained in:
Yan Zhulanow
2014-11-05 16:37:28 +03:00
parent 77880647ad
commit 2ff7ec4a64
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-jps-plugin/src/KotlinAndroidJpsPlugin.kt
+11 -1
View File
@@ -27,6 +27,8 @@ import org.jetbrains.kotlin.android.AndroidCommandLineProcessor
import org.jetbrains.jet.utils.PathUtil import org.jetbrains.jet.utils.PathUtil
public class KotlinAndroidJpsPlugin : KotlinJpsCompilerArgumentsProvider { public class KotlinAndroidJpsPlugin : KotlinJpsCompilerArgumentsProvider {
private val jarFileName = "android-compiler-plugin.jar"
override fun getExtraArguments(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List<String> { override fun getExtraArguments(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List<String> {
val module = moduleBuildTarget.getModule() val module = moduleBuildTarget.getModule()
return listOf( return listOf(
@@ -36,8 +38,16 @@ public class KotlinAndroidJpsPlugin : KotlinJpsCompilerArgumentsProvider {
} }
override fun getClasspath(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List<String> { override fun getClasspath(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List<String> {
val inJar = PathUtil.getJarPathForClass(javaClass).isFile()
return listOf( return listOf(
File(PathUtil.getJarPathForClass(javaClass).getParentFile().getParentFile(), "android-compiler-plugin.jar").getAbsolutePath() if (inJar) {
val libDirectory = PathUtil.getJarPathForClass(javaClass).getParentFile().getParentFile()
File(libDirectory, jarFileName).getAbsolutePath()
} else {
// We're in tests now (in out/production/android-jps-plugin)
val kotlinProjectDirectory = PathUtil.getJarPathForClass(javaClass).getParentFile().getParentFile().getParentFile()
File(kotlinProjectDirectory, "dist/kotlinc/lib/$jarFileName").getAbsolutePath()
}
) )
} }