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

Fix idea home path usages

Browse Source
This commit is contained in:
Ilya Chernikov
2017-12-21 10:24:38 +01:00
committed by Vyacheslav Gerasimov
parent 2dc4769c0a
commit 0c35e79283
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/build.gradle.kts
+1
View File
@@ -86,6 +86,7 @@ projectTest {
doFirst { doFirst {
systemProperty("ant.classpath", antLauncherJar.asPath) systemProperty("ant.classpath", antLauncherJar.asPath)
systemProperty("ant.launcher.class", "org.apache.tools.ant.Main") systemProperty("ant.launcher.class", "org.apache.tools.ant.Main")
systemProperty("idea.home.path", intellijRootDir().canonicalPath)
} }
} }
idea/build.gradle.kts
+1 -1
View File
@@ -118,7 +118,7 @@ projectTest {
dependsOnTaskIfExistsRec("dist", project = rootProject) dependsOnTaskIfExistsRec("dist", project = rootProject)
workingDir = rootDir workingDir = rootDir
afterEvaluate { afterEvaluate {
systemProperty("ideaSdk.path", intellijRootDir().canonicalPath) systemProperty("idea.home.path", intellijRootDir().canonicalPath)
} }
} }
idea/tests/org/jetbrains/kotlin/psi/KotlinLibInjectionTest.kt
+2 -2
View File
@@ -55,8 +55,8 @@ class KotlinLibInjectionTest : AbstractInjectionTest() {
override fun getProjectDescriptor(): LightProjectDescriptor { override fun getProjectDescriptor(): LightProjectDescriptor {
val ideaSdkPath = System.getProperty("ideaSdk.path")?.takeIf { File(it).isDirectory } val ideaSdkPath = System.getProperty("idea.home.path")?.takeIf { File(it).isDirectory }
?: throw RuntimeException("Unable to get a valid path from 'ideaSdk.path' property, please point it to the Idea SDK location") ?: throw RuntimeException("Unable to get a valid path from 'idea.home.path' property, please point it to the Idea location")
return SdkAndMockLibraryProjectDescriptor( return SdkAndMockLibraryProjectDescriptor(
PluginTestCaseBase.getTestDataPathBase() + "/injection/lib/", false, false, false, true, PluginTestCaseBase.getTestDataPathBase() + "/injection/lib/", false, false, false, true,
listOf(File(ideaSdkPath, "lib/annotations.jar").absolutePath)) listOf(File(ideaSdkPath, "lib/annotations.jar").absolutePath))