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

Fix 'ant dist' build against 172 branch

Browse Source
This commit is contained in:
Dmitry Jemerov
2017-05-03 18:45:06 +02:00
committed by Nikolay Krasko
parent 20d0d49cc3
commit 548e86285c
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+1
View File
@@ -394,6 +394,7 @@
<zipfileset src="${basedir}/ideaSDK/core/log4j.jar" excludes="META-INF/jb/** META-INF/LICENSE"/> <zipfileset src="${basedir}/ideaSDK/core/log4j.jar" excludes="META-INF/jb/** META-INF/LICENSE"/>
<zipfileset src="${basedir}/ideaSDK/core/picocontainer.jar"/> <zipfileset src="${basedir}/ideaSDK/core/picocontainer.jar"/>
<zipfileset src="${basedir}/ideaSDK/core/snappy-in-java-0.5.1.jar"/> <zipfileset src="${basedir}/ideaSDK/core/snappy-in-java-0.5.1.jar"/>
<zipfileset src="${basedir}/ideaSDK/core/streamex-0.6.2.jar"/>
<zipfileset src="${basedir}/ideaSDK/core/trove4j.jar"/> <zipfileset src="${basedir}/ideaSDK/core/trove4j.jar"/>
<zipfileset src="${basedir}/ideaSDK/core/xpp3-1.1.4-min.jar"/> <zipfileset src="${basedir}/ideaSDK/core/xpp3-1.1.4-min.jar"/>
<zipfileset src="${basedir}/ideaSDK/core/xstream-1.4.8.jar"/> <zipfileset src="${basedir}/ideaSDK/core/xstream-1.4.8.jar"/>
compiler/compiler.pro
+4
View File
@@ -52,6 +52,10 @@ messages/**)
-dontwarn org.w3c.dom.ElementTraversal -dontwarn org.w3c.dom.ElementTraversal
-dontwarn javaslang.match.annotation.Unapply -dontwarn javaslang.match.annotation.Unapply
-dontwarn javaslang.match.annotation.Patterns -dontwarn javaslang.match.annotation.Patterns
-dontwarn com.google.errorprone.**
-dontwarn com.google.j2objc.**
-dontwarn javax.crypto.**
-dontwarn java.lang.invoke.MethodHandle
-dontwarn org.jline.builtins.Nano$Buffer -dontwarn org.jline.builtins.Nano$Buffer
-libraryjars '<rtjar>' -libraryjars '<rtjar>'
update_dependencies.xml
+1
View File
@@ -617,6 +617,7 @@
<file file="@{idea.dir}/lib/xpp3-1.1.4-min.jar"/> <file file="@{idea.dir}/lib/xpp3-1.1.4-min.jar"/>
<file file="@{idea.dir}/lib/asm-all.jar"/> <file file="@{idea.dir}/lib/asm-all.jar"/>
<file file="@{idea.dir}/lib/snappy-in-java-0.5.1.jar"/> <file file="@{idea.dir}/lib/snappy-in-java-0.5.1.jar"/>
<file file="@{idea.dir}/lib/streamex-0.6.2.jar"/>
<!-- TODO temporary workaround since util-rt is not packaged into intellij-core.jar --> <!-- TODO temporary workaround since util-rt is not packaged into intellij-core.jar -->
<file file="@{idea.dir}/lib/util.jar"/> <file file="@{idea.dir}/lib/util.jar"/>