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

Update to IDEA 3371.3

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2015-07-24 14:16:30 +03:00
parent a64f1a86c0
commit e66569c451
17 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/libraries/android_plugin.xml
Generated
+1 -1
View File
@@ -9,7 +9,7 @@
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/" /> <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES> </SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/ideaSDK/plugins/android/lib" recursive="false" /> <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/plugins/android/lib" recursive="false" />
<jarDirectory url="file://$PROJECT_DIR$/ideaSDK/plugins/android/lib/jps" recursive="false" /> <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/plugins/android/lib/jps" recursive="false" />
.idea/libraries/copyright_plugin.xml
Generated
+1 -1
View File
@@ -8,7 +8,7 @@
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/" /> <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</component> </component>
.idea/libraries/coverage_plugin.xml
Generated
+1 -1
View File
@@ -7,7 +7,7 @@
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/" /> <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</component> </component>
.idea/libraries/gradle_and_groovy_plugin.xml
Generated
+1 -1
View File
@@ -10,7 +10,7 @@
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="file://$PROJECT_DIR$/ideaSDK/plugins/gradle/lib" /> <root url="file://$PROJECT_DIR$/ideaSDK/plugins/gradle/lib" />
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/" /> <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES> </SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/ideaSDK/plugins/gradle/lib" recursive="false" /> <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/plugins/gradle/lib" recursive="false" />
<jarDirectory url="file://$PROJECT_DIR$/ideaSDK/plugins/Groovy/lib" recursive="false" /> <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/plugins/Groovy/lib" recursive="false" />
.idea/libraries/idea_full.xml
Generated
+2 -2
View File
@@ -2,7 +2,7 @@
<library name="idea-full"> <library name="idea-full">
<ANNOTATIONS> <ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" /> <root url="file://$PROJECT_DIR$/annotations" />
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/" /> <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</ANNOTATIONS> </ANNOTATIONS>
<CLASSES> <CLASSES>
<root url="file://$PROJECT_DIR$/ideaSDK/lib" /> <root url="file://$PROJECT_DIR$/ideaSDK/lib" />
@@ -12,7 +12,7 @@
<root url="jar://$PROJECT_DIR$/dependencies/guava-17.0-sources.jar!/" /> <root url="jar://$PROJECT_DIR$/dependencies/guava-17.0-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/asm5-src.zip!/" /> <root url="jar://$PROJECT_DIR$/dependencies/asm5-src.zip!/" />
<root url="jar://$PROJECT_DIR$/dependencies/cli-parser-1.1.1-sources.jar!/" /> <root url="jar://$PROJECT_DIR$/dependencies/cli-parser-1.1.1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/" /> <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES> </SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/ideaSDK/lib" recursive="false" /> <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/lib" recursive="false" />
</library> </library>
.idea/libraries/intellij_core.xml
Generated
+2 -2
View File
@@ -2,7 +2,7 @@
<library name="intellij-core"> <library name="intellij-core">
<ANNOTATIONS> <ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" /> <root url="file://$PROJECT_DIR$/annotations" />
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/" /> <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</ANNOTATIONS> </ANNOTATIONS>
<CLASSES> <CLASSES>
<root url="file://$PROJECT_DIR$/ideaSDK/core" /> <root url="file://$PROJECT_DIR$/ideaSDK/core" />
@@ -11,7 +11,7 @@
<SOURCES> <SOURCES>
<root url="jar://$PROJECT_DIR$/dependencies/guava-17.0-sources.jar!/" /> <root url="jar://$PROJECT_DIR$/dependencies/guava-17.0-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/dependencies/asm5-src.zip!/" /> <root url="jar://$PROJECT_DIR$/dependencies/asm5-src.zip!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/" /> <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES> </SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/ideaSDK/core" recursive="false" /> <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/core" recursive="false" />
</library> </library>
.idea/libraries/intellij_core_analysis.xml
Generated
+2 -2
View File
@@ -2,7 +2,7 @@
<library name="intellij-core-analysis"> <library name="intellij-core-analysis">
<ANNOTATIONS> <ANNOTATIONS>
<root url="file://$PROJECT_DIR$/annotations" /> <root url="file://$PROJECT_DIR$/annotations" />
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/" /> <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</ANNOTATIONS> </ANNOTATIONS>
<CLASSES> <CLASSES>
<root url="jar://$PROJECT_DIR$/ideaSDK/core-analysis/intellij-core-analysis.jar!/" /> <root url="jar://$PROJECT_DIR$/ideaSDK/core-analysis/intellij-core-analysis.jar!/" />
@@ -11,7 +11,7 @@
<SOURCES> <SOURCES>
<root url="jar://$PROJECT_DIR$/dependencies/asm5-src.zip!/" /> <root url="jar://$PROJECT_DIR$/dependencies/asm5-src.zip!/" />
<root url="jar://$PROJECT_DIR$/dependencies/guava-17.0-sources.jar!/" /> <root url="jar://$PROJECT_DIR$/dependencies/guava-17.0-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/" /> <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</component> </component>
.idea/libraries/intellilang_plugin.xml
Generated
+1 -1
View File
@@ -5,7 +5,7 @@
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/" /> <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</component> </component>
.idea/libraries/java_i18n.xml
Generated
+1 -1
View File
@@ -8,7 +8,7 @@
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/" /> <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</component> </component>
.idea/libraries/jps.xml
Generated
+1 -1
View File
@@ -9,7 +9,7 @@
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$PROJECT_DIR$/dependencies/protobuf-java-2.5.0-sources.jar!/" /> <root url="jar://$PROJECT_DIR$/dependencies/protobuf-java-2.5.0-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/" /> <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES> </SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/ideaSDK/jps" recursive="false" /> <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/jps" recursive="false" />
</library> </library>
.idea/libraries/jps_model.xml
Generated
+1 -1
View File
@@ -8,7 +8,7 @@
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/" /> <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</component> </component>
.idea/libraries/jps_test.xml
Generated
+1 -1
View File
@@ -8,7 +8,7 @@
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/" /> <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES> </SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/ideaSDK/jps/test" recursive="false" /> <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/jps/test" recursive="false" />
</library> </library>
.idea/libraries/junit_plugin.xml
Generated
+1 -1
View File
@@ -8,7 +8,7 @@
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/" /> <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</component> </component>
.idea/libraries/maven.xml
Generated
+1 -1
View File
@@ -8,7 +8,7 @@
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/" /> <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES> </SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/ideaSDK/plugins/maven/lib" recursive="false" /> <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/plugins/maven/lib" recursive="false" />
</library> </library>
.idea/libraries/properties.xml
Generated
+1 -1
View File
@@ -8,7 +8,7 @@
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/" /> <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</component> </component>
.idea/libraries/testng_plugin.xml
Generated
+1 -1
View File
@@ -9,7 +9,7 @@
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/" /> <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</component> </component>
update_dependencies.xml
+8 -8
View File
@@ -1,5 +1,5 @@
<project name="Update Dependencies" default="update"> <project name="Update Dependencies" default="update">
<property name="ideaVersion" value="142.3230.1"/> <property name="ideaVersion" value="142.3371.3"/>
<property name="kotlin.bootstrap.locator" value="buildType:bt345,tag:bootstrap,status:SUCCESS"/> <property name="kotlin.bootstrap.locator" value="buildType:bt345,tag:bootstrap,status:SUCCESS"/>
<property name="kotlin.bootstrap.locator.force" value="false"/> <property name="kotlin.bootstrap.locator.force" value="false"/>
@@ -722,7 +722,7 @@
<copy file="@{download.file.archive.jps-build-test}" tofile="@{jps-test}/jps-build-test.jar"/> <copy file="@{download.file.archive.jps-build-test}" tofile="@{jps-test}/jps-build-test.jar"/>
<mkdir dir="@{sources}"/> <mkdir dir="@{sources}"/>
<copy file="@{download.file.archive.sources}" tofile="@{sources}/sources.zip" overwrite="true"/> <copy file="@{download.file.archive.sources}" tofile="@{sources}/sources.jar" overwrite="true"/>
</then> </then>
</if> </if>
@@ -740,8 +740,8 @@
<delete dir="@{download.dir}"/> <delete dir="@{download.dir}"/>
<mkdir dir="@{download.dir}"/> <mkdir dir="@{download.dir}"/>
<get src="@{base.repository.url}/ideaIC/@{idea.maven.version}/ideaIC-@{idea.maven.version}-sources.zip" <get src="@{base.repository.url}/ideaIC/@{idea.maven.version}/ideaIC-@{idea.maven.version}-sources.jar"
dest="@{download.dir}/ideaIC-@{idea.maven.version}-sources.zip" usetimestamp="true"/> dest="@{download.dir}/ideaIC-@{idea.maven.version}-sources.jar" usetimestamp="true"/>
<get src="@{base.repository.url}/ideaIC/@{idea.maven.version}/ideaIC-@{idea.maven.version}.zip" <get src="@{base.repository.url}/ideaIC/@{idea.maven.version}/ideaIC-@{idea.maven.version}.zip"
dest="@{download.dir}/ideaIC-@{idea.maven.version}.zip" usetimestamp="true"/> dest="@{download.dir}/ideaIC-@{idea.maven.version}.zip" usetimestamp="true"/>
@@ -767,7 +767,7 @@
download.dir.jps-standalone="@{download.dir}/jps-standalone-@{idea.maven.version}" download.dir.jps-standalone="@{download.dir}/jps-standalone-@{idea.maven.version}"
download.file.archive.idea="@{download.dir}/ideaIC-@{idea.maven.version}.zip" download.file.archive.idea="@{download.dir}/ideaIC-@{idea.maven.version}.zip"
download.file.archive.idea.win.only="true" download.file.archive.idea.win.only="true"
download.file.archive.sources="@{download.dir}/ideaIC-@{idea.maven.version}-sources.zip" download.file.archive.sources="@{download.dir}/ideaIC-@{idea.maven.version}-sources.jar"
download.file.archive.jps-build-test="@{download.dir}/jps-build-test-@{idea.maven.version}.jar"/> download.file.archive.jps-build-test="@{download.dir}/jps-build-test-@{idea.maven.version}.jar"/>
</sequential> </sequential>
</macrodef> </macrodef>
@@ -852,8 +852,8 @@
<get src="${content.base.url}/core/intellij-core-analysis.jar" dest="${core.dir}/intellij-core-analysis.jar"/> <get src="${content.base.url}/core/intellij-core-analysis.jar" dest="${core.dir}/intellij-core-analysis.jar"/>
<delete file="${idea.download.dir}/idea-sdk-sources.zip" failonerror="false"/> <delete file="${idea.download.dir}/idea-sdk-sources.jar" failonerror="false"/>
<get src="${content.base.url}/sources.zip" dest="${idea.download.dir}/idea-sdk-sources.zip"/> <get src="${content.base.url}/sources.jar" dest="${idea.download.dir}/idea-sdk-sources.jar"/>
</then> </then>
</if> </if>
@@ -865,7 +865,7 @@
download.dir.jps-standalone="${jps.extracted.dir}" download.dir.jps-standalone="${jps.extracted.dir}"
download.file.archive.idea="${idea.download.dir}/${idea.archive.name}" download.file.archive.idea="${idea.download.dir}/${idea.archive.name}"
download.file.archive.idea.win.only="false" download.file.archive.idea.win.only="false"
download.file.archive.sources="${idea.download.dir}/idea-sdk-sources.zip" download.file.archive.sources="${idea.download.dir}/idea-sdk-sources.jar"
download.file.archive.jps-build-test="${idea.download.dir}/jps-build-test.jar"/> download.file.archive.jps-build-test="${idea.download.dir}/jps-build-test.jar"/>
</sequential> </sequential>
</macrodef> </macrodef>