Drop other references to ideaSdk

This commit is contained in:
Ilya Chernikov
2017-11-08 16:54:00 +01:00
committed by Vyacheslav Gerasimov
parent 9766508512
commit 8bc95295eb
3 changed files with 1 additions and 12 deletions
+1 -7
View File
@@ -464,13 +464,7 @@ configure<IdeaModel> {
commonLocalDataDir, commonLocalDataDir,
".gradle", ".gradle",
"dependencies", "dependencies",
"dist", "dist"
"ideaSDK/bin",
"ideaSDK/androidSDK",
"ideaSDK/config",
"ideaSDK/config-idea",
"ideaSDK/system",
"ideaSDK/system-idea"
).toSet() ).toSet()
} }
} }
@@ -42,8 +42,6 @@ class CodeConformanceTest : TestCase() {
"libraries/tools/kotlin-js-tests/src/test/web/qunit.js", "libraries/tools/kotlin-js-tests/src/test/web/qunit.js",
"out", "out",
"dist", "dist",
"ideaSDK",
"ultimate/ideaSDK",
"libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/build/tmp", "libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/build/tmp",
"libraries/tools/kotlin-maven-plugin/target", "libraries/tools/kotlin-maven-plugin/target",
"compiler/testData/psi/kdoc", "compiler/testData/psi/kdoc",
@@ -55,8 +53,6 @@ class CodeConformanceTest : TestCase() {
"dependencies", "dependencies",
"out", "out",
"dist", "dist",
"ideaSDK",
"ultimate/ideaSDK",
"compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt", "compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt",
"idea/idea-jvm/src/org/jetbrains/kotlin/idea/copyright", "idea/idea-jvm/src/org/jetbrains/kotlin/idea/copyright",
"js/js.tests/.gradle", "js/js.tests/.gradle",
-1
View File
@@ -14,7 +14,6 @@
<property name="bootstrap.reflect" location="${dependencies.dir}/bootstrap-compiler/Kotlin/kotlinc/lib/kotlin-reflect.jar"/> <property name="bootstrap.reflect" location="${dependencies.dir}/bootstrap-compiler/Kotlin/kotlinc/lib/kotlin-reflect.jar"/>
<target name="force-enable-kotlin-plugin"> <target name="force-enable-kotlin-plugin">
<property name="disable_plugins.file.path" location="${basedir}/../ideaSDK/config-idea/disabled_plugins.txt"/>
<available property="disable_plugins.found" file="${disable_plugins.file.path}"/> <available property="disable_plugins.found" file="${disable_plugins.file.path}"/>
<sequential if:set="disable_plugins.found"> <sequential if:set="disable_plugins.found">