Run tests with JDK 1.8 and remove hack with downloading libraries from previous ide

This commit is contained in:
Nikolay Krasko
2017-01-18 20:59:40 +03:00
committed by Nikolay Krasko
parent fe8e02f4cf
commit 110fc103de
3 changed files with 3 additions and 85 deletions
+1 -13
View File
@@ -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"/>