Drop ant-1.7 from project, advance Ant to 1.8.2
Ant 1.8.2 has the API (namely, CompilerAdapterExtension#getSupportedFileExtensions) which will allow to fix a critical bug in <withKotlin/> task (see KT-7870)
This commit is contained in:
Generated
+14
@@ -0,0 +1,14 @@
|
|||||||
|
<component name="libraryTable">
|
||||||
|
<library name="ant">
|
||||||
|
<ANNOTATIONS>
|
||||||
|
<root url="file://$PROJECT_DIR$/annotations" />
|
||||||
|
</ANNOTATIONS>
|
||||||
|
<CLASSES>
|
||||||
|
<root url="jar://$PROJECT_DIR$/dependencies/ant-1.8/lib/ant.jar!/" />
|
||||||
|
</CLASSES>
|
||||||
|
<JAVADOC />
|
||||||
|
<SOURCES>
|
||||||
|
<root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.8.2-src.zip!/apache-ant-1.8.2/src/main" />
|
||||||
|
</SOURCES>
|
||||||
|
</library>
|
||||||
|
</component>
|
||||||
Generated
-21
@@ -1,21 +0,0 @@
|
|||||||
<component name="libraryTable">
|
|
||||||
<library name="ant-1.7">
|
|
||||||
<ANNOTATIONS>
|
|
||||||
<root url="file://$PROJECT_DIR$/annotations" />
|
|
||||||
</ANNOTATIONS>
|
|
||||||
<CLASSES>
|
|
||||||
<root url="jar://$PROJECT_DIR$/dependencies/ant-1.7/lib/ant.jar!/" />
|
|
||||||
</CLASSES>
|
|
||||||
<JAVADOC />
|
|
||||||
<SOURCES>
|
|
||||||
<root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.7.0-src.zip!/apache-ant-1.7.0/src/etc/testcases/core/loaderref/src" />
|
|
||||||
<root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.7.0-src.zip!/apache-ant-1.7.0/src/etc/testcases/core/containersrc" />
|
|
||||||
<root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.7.0-src.zip!/apache-ant-1.7.0/src/etc/testcases/types/assertions" />
|
|
||||||
<root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.7.0-src.zip!/apache-ant-1.7.0/src/etc/testcases/taskdefs/apt" />
|
|
||||||
<root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.7.0-src.zip!/apache-ant-1.7.0/src/etc/testcases/taskdefs/rmic/src" />
|
|
||||||
<root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.7.0-src.zip!/apache-ant-1.7.0/src/etc/testcases/taskdefs/fixcrlf/input" />
|
|
||||||
<root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.7.0-src.zip!/apache-ant-1.7.0/src/etc/testcases/taskdefs/fixcrlf/expected" />
|
|
||||||
<root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.7.0-src.zip!/apache-ant-1.7.0/src/main" />
|
|
||||||
</SOURCES>
|
|
||||||
</library>
|
|
||||||
</component>
|
|
||||||
+1
-1
@@ -7,7 +7,7 @@
|
|||||||
</content>
|
</content>
|
||||||
<orderEntry type="inheritedJdk" />
|
<orderEntry type="inheritedJdk" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
<orderEntry type="library" name="ant-1.7" level="project" />
|
<orderEntry type="library" name="ant" level="project" />
|
||||||
<orderEntry type="library" name="kotlin-runtime" level="project" />
|
<orderEntry type="library" name="kotlin-runtime" level="project" />
|
||||||
<orderEntry type="module" module-name="preloader" />
|
<orderEntry type="module" module-name="preloader" />
|
||||||
</component>
|
</component>
|
||||||
|
|||||||
@@ -577,7 +577,7 @@
|
|||||||
<classpath>
|
<classpath>
|
||||||
<file file="${bootstrap.runtime}"/>
|
<file file="${bootstrap.runtime}"/>
|
||||||
<file file="${bootstrap.reflect}"/>
|
<file file="${bootstrap.reflect}"/>
|
||||||
<pathelement location="${dependencies.dir}/ant-1.7/lib/ant.jar"/>
|
<pathelement location="${dependencies.dir}/ant-1.8/lib/ant.jar"/>
|
||||||
<pathelement location="${kotlin-home}/lib/kotlin-preloader.jar"/>
|
<pathelement location="${kotlin-home}/lib/kotlin-preloader.jar"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
</javac2>
|
</javac2>
|
||||||
|
|||||||
@@ -146,9 +146,8 @@
|
|||||||
<get src="http://jarjar.googlecode.com/files/jarjar-1.4.jar" dest="dependencies/download/jarjar-1.4.jar" usetimestamp="true"/>
|
<get src="http://jarjar.googlecode.com/files/jarjar-1.4.jar" dest="dependencies/download/jarjar-1.4.jar" usetimestamp="true"/>
|
||||||
<copy file="dependencies/download/jarjar-1.4.jar" tofile="dependencies/jarjar.jar" overwrite="true"/>
|
<copy file="dependencies/download/jarjar-1.4.jar" tofile="dependencies/jarjar.jar" overwrite="true"/>
|
||||||
|
|
||||||
<!-- ant 1.7.0, 1.8.0 -->
|
<!-- ant 1.8.2 -->
|
||||||
<get-ant-library version="1.7.0" folderName="ant-1.7"/>
|
<get-ant-library version="1.8.2" folderName="ant-1.8"/>
|
||||||
<get-ant-library version="1.8.0" folderName="ant-1.8"/>
|
|
||||||
|
|
||||||
<!-- dx.jar -->
|
<!-- dx.jar -->
|
||||||
<property name="android-build-tools.zip" value="build-tools_r21.1.1-linux.zip"/>
|
<property name="android-build-tools.zip" value="build-tools_r21.1.1-linux.zip"/>
|
||||||
|
|||||||
Reference in New Issue
Block a user