From 110fc103de24ec3c981366ceb9789901943bb425 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Wed, 18 Jan 2017 20:59:40 +0300
Subject: [PATCH] Run tests with JDK 1.8 and remove hack with downloading
 libraries from previous ide

---
 compiler/tests-common/tests-common.iml | 37 +-------------------------
 compiler/tests/compiler-tests.iml      | 37 +-------------------------
 update_dependencies.xml                | 14 +---------
 3 files changed, 3 insertions(+), 85 deletions(-)

diff --git a/compiler/tests-common/tests-common.iml b/compiler/tests-common/tests-common.iml
index f8fcef43dda..125931ef603 100644
--- a/compiler/tests-common/tests-common.iml
+++ b/compiler/tests-common/tests-common.iml
@@ -29,41 +29,6 @@
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
     <orderEntry type="library" scope="TEST" name="junit-4.12" level="project" />
     <orderEntry type="library" name="intellij-core" level="project" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../ideaSDK/lib/commons-httpclient-3.1-patched.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../dependencies/download/idea-for-compiler-test/idea_rt.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../dependencies/download/idea-for-compiler-test/openapi.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../ideaSDK/core/asm-all.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
+    <orderEntry type="library" name="idea-full" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
index 6985a220130..2c24c8fea38 100644
--- a/compiler/tests/compiler-tests.iml
+++ b/compiler/tests/compiler-tests.iml
@@ -30,45 +30,10 @@
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
     <orderEntry type="library" scope="TEST" name="junit-4.12" level="project" />
     <orderEntry type="library" name="intellij-core" level="project" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../ideaSDK/lib/commons-httpclient-3.1-patched.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../dependencies/download/idea-for-compiler-test/idea_rt.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../dependencies/download/idea-for-compiler-test/openapi.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../ideaSDK/core/asm-all.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module" module-name="ir.tree" scope="TEST" />
     <orderEntry type="module" module-name="backend.common" scope="TEST" />
     <orderEntry type="module" module-name="ir.psi2ir" scope="TEST" />
     <orderEntry type="module" module-name="ir.ir2cfg" scope="TEST" />
+    <orderEntry type="library" name="idea-full" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 19b187eb021..5d1a9597f11 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -177,7 +177,7 @@
         </jar>
     </target>
 
-    <target name="fetch-third-party" depends="make-dependency-dirs, make-native-platform-uberjar, fetch-idea-artifacts-for-compiler-tests">
+    <target name="fetch-third-party" depends="make-dependency-dirs, make-native-platform-uberjar">
         <antcall target="override-version"/>
 
         <!-- ProGuard -->
@@ -845,18 +845,6 @@
     -->
     <target name="fetch-annotations"/>
 
-    <target name="fetch-idea-artifacts-for-compiler-tests">
-        <!-- For running compiler tests with Java 1.6 -->
-        <local name="idea.for.compiler.testing.dir"/>
-        <property name="idea.for.compiler.testing.dir" value="dependencies/download/idea-for-compiler-test"/>
-        <mkdir dir="${idea.for.compiler.testing.dir}"/>
-        <local name="idea.for.compiler.testing.base.url"/>
-        <property name="idea.for.compiler.testing.base.url"
-                  value="https://teamcity.jetbrains.com/guestAuth/repository/download/IntelliJIdeaCe_OpenapiJar/idea-15.0.5"/>
-        <get src="${idea.for.compiler.testing.base.url}/idea_rt.jar" dest="${idea.for.compiler.testing.dir}/idea_rt.jar" usetimestamp="true"/>
-        <get src="${idea.for.compiler.testing.base.url}/openapi.jar" dest="${idea.for.compiler.testing.dir}/openapi.jar" usetimestamp="true"/>
-    </target>
-
     <target name="get_android_studio">
         <condition property="android.os.tag" value="windows">
             <os family="windows"/>