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

Merge branch 'master' into idea13

Browse Source 
Conflicts:
	idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java
	idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java
	libraries/stdlib/src/kotlin/properties/Properties.kt
	libraries/stdlib/test/properties/delegation/DelegationTest.kt
	libraries/stdlib/test/properties/delegation/MapDelegationTest.kt
	libraries/stdlib/test/properties/delegation/lazy/LazyValuesTest.kt
	update_dependencies.xml
This commit is contained in:
Natalia.Ukhorskaya
2013-06-04 11:26:36 +04:00
parent fc3a413fba acbccb9411
commit 8429162220
198 changed files with 3212 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files
update_dependencies.xml
+3 -11
View File
@@ -126,17 +126,9 @@
<macrodef name="get-asm4-and-rename-packages">
<sequential>
<!-- Download vanilla ASM 4.0 & unzip the needed jars and sources -->
<get-maven-library prefix="org/ow2/asm" lib="asm-debug-all" version="4.0"/>
<!-- Rename packages in the jars -->
<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${basedir}/dependencies/jarjar.jar"/>
<jarjar jarfile="dependencies/jetbrains-asm-debug-all-4.0.jar">
<zipfileset src="dependencies/download/asm-debug-all-4.0.jar"/>
<rule pattern="org.objectweb.asm.**" result="org.jetbrains.asm4.@1"/>
</jarjar>
<!-- Download vanilla ASM 4.0 & unzip the needed jars and sources from idea13 build (with debug info and patched for java 8) -->
<get src="http://teamcity.jetbrains.com/guestAuth/repository/download/bt410/83470:id/jps/asm4-all.jar" dest="dependencies/jetbrains-asm-debug-all-4.0.jar" usetimestamp="true"/>
<get-maven-library prefix="org/ow2/asm" lib="asm-debug-all" version="4.0" bin="false"/>
<!-- Rename packages in the sources -->
<delete dir="dependencies/download/asm-src" failonerror="false"/>