diff options
28 files changed, 231 insertions, 223 deletions
diff --git a/.idea/modules/core/core_main.iml b/.idea/modules/core/core_main.iml index 845ac344..8684ad43 100644 --- a/.idea/modules/core/core_main.iml +++ b/.idea/modules/core/core_main.iml @@ -31,7 +31,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/jfxrt.jar!/" /> + <root url="jar:///usr/lib/jvm/java-8-oracle/lib/tools.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -40,7 +40,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/jaccess.jar!/" /> + <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/zipfs.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -49,7 +49,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/cldrdata.jar!/" /> + <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/localedata.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -58,7 +58,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../lib/intellij-core-analysis.jar!/" /> + <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/jaccess.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -67,7 +67,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/zipfs.jar!/" /> + <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/sunec.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -76,7 +76,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/localedata.jar!/" /> + <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/dnsns.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -85,7 +85,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/sunec.jar!/" /> + <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/sunpkcs11.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -94,7 +94,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/dnsns.jar!/" /> + <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/jfxrt.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -103,7 +103,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/sunpkcs11.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../lib/intellij-core-analysis.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -112,7 +112,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar:///usr/lib/jvm/java-8-oracle/lib/tools.jar!/" /> + <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/cldrdata.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -199,7 +199,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M03" level="project" /> <orderEntry type="module-library" scope="RUNTIME"> <library> <CLASSES> @@ -209,10 +209,10 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: com.google.inject:guice:3.0" level="project" /> <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.8.3" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" /> <orderEntry type="library" name="Gradle: aopalliance:aopalliance:1.0" level="project" /> <orderEntry type="library" name="Gradle: org.sonatype.sisu.inject:cglib:2.2.1-v20090111" level="project" /> diff --git a/.idea/modules/core/core_test.iml b/.idea/modules/core/core_test.iml index a4999467..3d37c32a 100644 --- a/.idea/modules/core/core_test.iml +++ b/.idea/modules/core/core_test.iml @@ -23,7 +23,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/sunec.jar!/" /> + <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/jfxrt.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -32,7 +32,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/nashorn.jar!/" /> + <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/dnsns.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -41,7 +41,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar:///usr/lib/jvm/java-8-oracle/lib/tools.jar!/" /> + <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/jaccess.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -50,7 +50,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/sunpkcs11.jar!/" /> + <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/nashorn.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -59,7 +59,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/dnsns.jar!/" /> + <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/zipfs.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -68,7 +68,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/jaccess.jar!/" /> + <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/localedata.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -77,7 +77,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/zipfs.jar!/" /> + <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/cldrdata.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -86,7 +86,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/localedata.jar!/" /> + <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/sunec.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -95,7 +95,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/cldrdata.jar!/" /> + <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/sunpkcs11.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -104,7 +104,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar:///usr/lib/jvm/java-8-oracle/jre/lib/ext/jfxrt.jar!/" /> + <root url="jar:///usr/lib/jvm/java-8-oracle/lib/tools.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -164,8 +164,8 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M02-8" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M03" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: com.google.inject:guice:3.0" level="project" /> <orderEntry type="module-library" scope="RUNTIME"> <library> @@ -196,6 +196,7 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-test-junit:1.1-M03" level="project" /> <orderEntry type="module-library" scope="RUNTIME"> <library> <CLASSES> @@ -205,8 +206,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-test-junit:1.1-M02-8" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M03" level="project" /> <orderEntry type="module-library" scope="RUNTIME"> <library> <CLASSES> @@ -220,8 +220,8 @@ <orderEntry type="library" name="Gradle: aopalliance:aopalliance:1.0" level="project" /> <orderEntry type="library" name="Gradle: org.sonatype.sisu.inject:cglib:2.2.1-v20090111" level="project" /> <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-test:1.1-M03" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Gradle: org.fusesource.jansi:jansi:1.11" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-test:1.1-M02-8" level="project" /> <orderEntry type="library" name="Gradle: asm:asm:3.1" level="project" /> </component> <component name="TestModuleProperties" production-module="core_main" /> diff --git a/.idea/modules/runners/android-gradle-plugin/android-gradle-plugin_main.iml b/.idea/modules/runners/android-gradle-plugin/android-gradle-plugin_main.iml index fee3b022..e757012d 100644 --- a/.idea/modules/runners/android-gradle-plugin/android-gradle-plugin_main.iml +++ b/.idea/modules/runners/android-gradle-plugin/android-gradle-plugin_main.iml @@ -12,11 +12,10 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="gradle-plugin_main" /> <orderEntry type="module" module-name="fatjar_main" /> - <orderEntry type="module" module-name="ant_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-compiler.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/trove4j.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -25,7 +24,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$USER_HOME$/.gradle/caches/2.14.1/generated-gradle-jars/gradle-api-2.14.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/jdom.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -34,7 +33,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/jdom.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-compiler.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -43,7 +42,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-script-runtime.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/asm-all.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -52,27 +51,28 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.14.1-all/8bnwg5hd3w55iofp58khbp6yv/gradle-2.14.1/lib/gradle-installation-beacon-2.14.1.jar!/" /> + <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.14.1-all/8bnwg5hd3w55iofp58khbp6yv/gradle-2.14.1/lib/groovy-all-2.4.4.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES> - <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.14.1-all/8bnwg5hd3w55iofp58khbp6yv/gradle-2.14.1/src/installation-beacon" /> - </SOURCES> + <SOURCES /> </library> </orderEntry> + <orderEntry type="module" module-name="cli_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/jps-model.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/markdown.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module" module-name="ant_main" /> + <orderEntry type="module" module-name="core_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/intellij-core-analysis.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-ide-common.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -81,7 +81,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/markdown.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/picocontainer.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -90,17 +90,16 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.14.1-all/8bnwg5hd3w55iofp58khbp6yv/gradle-2.14.1/lib/groovy-all-2.4.4.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/jps-model.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="core_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/trove4j.jar!/" /> + <root url="jar://$USER_HOME$/.gradle/caches/2.14.1/generated-gradle-jars/gradle-api-2.14.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -109,26 +108,27 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/protobuf-2.5.0-lite.jar!/" /> + <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.14.1-all/8bnwg5hd3w55iofp58khbp6yv/gradle-2.14.1/lib/gradle-installation-beacon-2.14.1.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.14.1-all/8bnwg5hd3w55iofp58khbp6yv/gradle-2.14.1/src/installation-beacon" /> + </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-ide-common.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/protobuf-2.5.0-lite.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="cli_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/picocontainer.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-script-runtime.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -137,7 +137,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/asm-all.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/intellij-core-analysis.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -158,8 +158,8 @@ <orderEntry type="library" name="Gradle: net.sf.jopt-simple:jopt-simple:4.9" level="project" /> <orderEntry type="library" name="Gradle: com.google.protobuf:protobuf-java:2.5.0" level="project" /> <orderEntry type="library" name="Gradle: org.antlr:antlr:3.5.2" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M02-8" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M03" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: com.google.inject:guice:3.0" level="project" /> <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.8.3" level="project" /> <orderEntry type="library" name="Gradle: org.fusesource.jansi:jansi:1.11" level="project" /> @@ -189,7 +189,7 @@ <orderEntry type="library" name="Gradle: org.ow2.asm:asm-debug-all:5.0.1" level="project" /> <orderEntry type="library" name="Gradle: org.antlr:antlr-runtime:3.5.2" level="project" /> <orderEntry type="library" name="Gradle: org.antlr:ST4:4.0.8" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" /> <orderEntry type="library" name="Gradle: aopalliance:aopalliance:1.0" level="project" /> <orderEntry type="library" name="Gradle: org.sonatype.sisu.inject:cglib:2.2.1-v20090111" level="project" /> diff --git a/.idea/modules/runners/android-gradle-plugin/android-gradle-plugin_test.iml b/.idea/modules/runners/android-gradle-plugin/android-gradle-plugin_test.iml index 7eee9bf7..3320ed7b 100644 --- a/.idea/modules/runners/android-gradle-plugin/android-gradle-plugin_test.iml +++ b/.idea/modules/runners/android-gradle-plugin/android-gradle-plugin_test.iml @@ -12,21 +12,19 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="android-gradle-plugin_main" /> <orderEntry type="module" module-name="gradle-plugin_main" /> - <orderEntry type="module" module-name="core_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/intellij-core-analysis.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-compiler.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="ant_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/protobuf-2.5.0-lite.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/markdown.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -35,7 +33,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-compiler.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/jps-model.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -44,16 +42,17 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/trove4j.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/asm-all.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module" module-name="core_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/markdown.jar!/" /> + <root url="jar://$USER_HOME$/.gradle/caches/2.14.1/generated-gradle-jars/gradle-api-2.14.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -62,7 +61,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/asm-all.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/intellij-core-analysis.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -71,7 +70,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-ide-common.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/picocontainer.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -86,31 +85,29 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="fatjar_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.14.1-all/8bnwg5hd3w55iofp58khbp6yv/gradle-2.14.1/lib/gradle-installation-beacon-2.14.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/jdom.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES> - <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.14.1-all/8bnwg5hd3w55iofp58khbp6yv/gradle-2.14.1/src/installation-beacon" /> - </SOURCES> + <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/jps-model.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-script-runtime.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module" module-name="cli_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-script-runtime.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-ide-common.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -119,31 +116,34 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/jdom.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/protobuf-2.5.0-lite.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="cli_main" /> + <orderEntry type="module" module-name="ant_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$USER_HOME$/.gradle/caches/2.14.1/generated-gradle-jars/gradle-api-2.14.1.jar!/" /> + <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.14.1-all/8bnwg5hd3w55iofp58khbp6yv/gradle-2.14.1/lib/gradle-installation-beacon-2.14.1.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="file://$USER_HOME$/.gradle/wrapper/dists/gradle-2.14.1-all/8bnwg5hd3w55iofp58khbp6yv/gradle-2.14.1/src/installation-beacon" /> + </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/picocontainer.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/trove4j.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module" module-name="fatjar_main" /> <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" /> <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" /> <orderEntry type="library" name="Gradle: com.android.tools.build:gradle:2.2.0" level="project" /> @@ -161,8 +161,8 @@ <orderEntry type="library" name="Gradle: net.sf.jopt-simple:jopt-simple:4.9" level="project" /> <orderEntry type="library" name="Gradle: com.google.protobuf:protobuf-java:2.5.0" level="project" /> <orderEntry type="library" name="Gradle: org.antlr:antlr:3.5.2" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M02-8" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M03" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: com.google.inject:guice:3.0" level="project" /> <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.8.3" level="project" /> <orderEntry type="library" name="Gradle: org.fusesource.jansi:jansi:1.11" level="project" /> @@ -192,7 +192,7 @@ <orderEntry type="library" name="Gradle: org.ow2.asm:asm-debug-all:5.0.1" level="project" /> <orderEntry type="library" name="Gradle: org.antlr:antlr-runtime:3.5.2" level="project" /> <orderEntry type="library" name="Gradle: org.antlr:ST4:4.0.8" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" /> <orderEntry type="library" name="Gradle: aopalliance:aopalliance:1.0" level="project" /> <orderEntry type="library" name="Gradle: org.sonatype.sisu.inject:cglib:2.2.1-v20090111" level="project" /> diff --git a/.idea/modules/runners/ant/ant_main.iml b/.idea/modules/runners/ant/ant_main.iml index 0308e250..435461a2 100644 --- a/.idea/modules/runners/ant/ant_main.iml +++ b/.idea/modules/runners/ant/ant_main.iml @@ -31,7 +31,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/markdown.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/jps-model.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -40,7 +40,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/intellij-core-analysis.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/asm-all.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -49,7 +49,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/protobuf-2.5.0-lite.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/picocontainer.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -58,7 +58,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-compiler.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/intellij-core-analysis.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -67,7 +67,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/jps-model.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-script-runtime.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -76,7 +76,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/picocontainer.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-compiler.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -85,7 +85,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-script-runtime.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-ide-common.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -94,7 +94,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/asm-all.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/markdown.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -103,19 +103,19 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-ide-common.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/protobuf-2.5.0-lite.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module" module-name="core_main" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M02-8" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M03" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: com.google.inject:guice:3.0" level="project" /> <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.8.3" level="project" /> <orderEntry type="library" name="Gradle: org.fusesource.jansi:jansi:1.11" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" /> <orderEntry type="library" name="Gradle: aopalliance:aopalliance:1.0" level="project" /> <orderEntry type="library" name="Gradle: org.sonatype.sisu.inject:cglib:2.2.1-v20090111" level="project" /> diff --git a/.idea/modules/runners/ant/ant_test.iml b/.idea/modules/runners/ant/ant_test.iml index b0a1b12d..b9254f79 100644 --- a/.idea/modules/runners/ant/ant_test.iml +++ b/.idea/modules/runners/ant/ant_test.iml @@ -23,7 +23,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-compiler.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-ide-common.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -32,7 +32,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/jdom.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/jps-model.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -41,7 +41,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-script-runtime.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/intellij-core-analysis.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -50,7 +50,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/asm-all.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/jdom.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -59,7 +59,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/jps-model.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/picocontainer.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -68,7 +68,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/intellij-core-analysis.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/protobuf-2.5.0-lite.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -77,7 +77,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/picocontainer.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/markdown.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -86,7 +86,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/protobuf-2.5.0-lite.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-compiler.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -95,7 +95,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/markdown.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/asm-all.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -104,19 +104,19 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-ide-common.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-script-runtime.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module" module-name="core_main" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M02-8" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M03" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: com.google.inject:guice:3.0" level="project" /> <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.8.3" level="project" /> <orderEntry type="library" name="Gradle: org.fusesource.jansi:jansi:1.11" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" /> <orderEntry type="library" name="Gradle: aopalliance:aopalliance:1.0" level="project" /> <orderEntry type="library" name="Gradle: org.sonatype.sisu.inject:cglib:2.2.1-v20090111" level="project" /> diff --git a/.idea/modules/runners/cli/cli_main.iml b/.idea/modules/runners/cli/cli_main.iml index 3f3a9e11..bede1965 100644 --- a/.idea/modules/runners/cli/cli_main.iml +++ b/.idea/modules/runners/cli/cli_main.iml @@ -31,7 +31,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/protobuf-2.5.0-lite.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/markdown.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -40,7 +40,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/intellij-core-analysis.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-script-runtime.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -49,7 +49,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/asm-all.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/jps-model.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -58,7 +58,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-compiler.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/intellij-core-analysis.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -67,7 +67,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/markdown.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/picocontainer.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -76,7 +76,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/jps-model.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-compiler.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -85,7 +85,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/picocontainer.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-ide-common.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -94,7 +94,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-script-runtime.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/protobuf-2.5.0-lite.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -103,19 +103,19 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-ide-common.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/asm-all.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module" module-name="core_main" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M02-8" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M03" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: com.google.inject:guice:3.0" level="project" /> <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.8.3" level="project" /> <orderEntry type="library" name="Gradle: org.fusesource.jansi:jansi:1.11" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" /> <orderEntry type="library" name="Gradle: aopalliance:aopalliance:1.0" level="project" /> <orderEntry type="library" name="Gradle: org.sonatype.sisu.inject:cglib:2.2.1-v20090111" level="project" /> diff --git a/.idea/modules/runners/cli/cli_test.iml b/.idea/modules/runners/cli/cli_test.iml index 3d33818a..13529ccb 100644 --- a/.idea/modules/runners/cli/cli_test.iml +++ b/.idea/modules/runners/cli/cli_test.iml @@ -23,7 +23,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/markdown.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/jdom.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -32,7 +32,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/protobuf-2.5.0-lite.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/jps-model.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -41,7 +41,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-script-runtime.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-ide-common.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -50,7 +50,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/intellij-core-analysis.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/protobuf-2.5.0-lite.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -59,7 +59,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/jps-model.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/picocontainer.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -68,7 +68,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-ide-common.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-compiler.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -77,7 +77,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/picocontainer.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/asm-all.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -86,7 +86,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-compiler.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/markdown.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -95,7 +95,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/asm-all.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/intellij-core-analysis.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -104,19 +104,19 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/jdom.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-script-runtime.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module" module-name="core_main" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M02-8" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M03" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: com.google.inject:guice:3.0" level="project" /> <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.8.3" level="project" /> <orderEntry type="library" name="Gradle: org.fusesource.jansi:jansi:1.11" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" /> <orderEntry type="library" name="Gradle: aopalliance:aopalliance:1.0" level="project" /> <orderEntry type="library" name="Gradle: org.sonatype.sisu.inject:cglib:2.2.1-v20090111" level="project" /> diff --git a/.idea/modules/runners/fatjar/fatjar_main.iml b/.idea/modules/runners/fatjar/fatjar_main.iml index 1d3b885c..e83b1d76 100644 --- a/.idea/modules/runners/fatjar/fatjar_main.iml +++ b/.idea/modules/runners/fatjar/fatjar_main.iml @@ -31,7 +31,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/protobuf-2.5.0-lite.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/markdown.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -40,7 +40,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-compiler.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/asm-all.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -49,7 +49,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/picocontainer.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-ide-common.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -58,7 +58,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/jps-model.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-compiler.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -67,7 +67,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/markdown.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-script-runtime.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -76,7 +76,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-ide-common.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/jps-model.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -85,7 +85,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-script-runtime.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/intellij-core-analysis.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -94,7 +94,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/asm-all.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/protobuf-2.5.0-lite.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -103,7 +103,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/intellij-core-analysis.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/picocontainer.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -112,12 +112,12 @@ <orderEntry type="module" module-name="cli_main" /> <orderEntry type="module" module-name="ant_main" /> <orderEntry type="module" module-name="core_main" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M02-8" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M03" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: com.google.inject:guice:3.0" level="project" /> <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.8.3" level="project" /> <orderEntry type="library" name="Gradle: org.fusesource.jansi:jansi:1.11" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" /> <orderEntry type="library" name="Gradle: aopalliance:aopalliance:1.0" level="project" /> <orderEntry type="library" name="Gradle: org.sonatype.sisu.inject:cglib:2.2.1-v20090111" level="project" /> diff --git a/.idea/modules/runners/fatjar/fatjar_test.iml b/.idea/modules/runners/fatjar/fatjar_test.iml index bb6f512f..8b78e731 100644 --- a/.idea/modules/runners/fatjar/fatjar_test.iml +++ b/.idea/modules/runners/fatjar/fatjar_test.iml @@ -23,7 +23,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-compiler.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/jps-model.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -32,7 +32,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/picocontainer.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/protobuf-2.5.0-lite.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -41,7 +41,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-script-runtime.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/intellij-core-analysis.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -50,7 +50,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/asm-all.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/picocontainer.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -59,7 +59,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/protobuf-2.5.0-lite.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/markdown.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -68,7 +68,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/intellij-core-analysis.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/jdom.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -77,7 +77,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/markdown.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-ide-common.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -86,7 +86,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/jdom.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-compiler.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -95,7 +95,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-ide-common.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/asm-all.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -104,7 +104,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/jps-model.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-script-runtime.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -113,12 +113,12 @@ <orderEntry type="module" module-name="cli_main" /> <orderEntry type="module" module-name="ant_main" /> <orderEntry type="module" module-name="core_main" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M02-8" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M03" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: com.google.inject:guice:3.0" level="project" /> <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.8.3" level="project" /> <orderEntry type="library" name="Gradle: org.fusesource.jansi:jansi:1.11" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" /> <orderEntry type="library" name="Gradle: aopalliance:aopalliance:1.0" level="project" /> <orderEntry type="library" name="Gradle: org.sonatype.sisu.inject:cglib:2.2.1-v20090111" level="project" /> diff --git a/.idea/modules/runners/gradle-plugin/gradle-plugin_main.iml b/.idea/modules/runners/gradle-plugin/gradle-plugin_main.iml index b515aff1..538446b4 100644 --- a/.idea/modules/runners/gradle-plugin/gradle-plugin_main.iml +++ b/.idea/modules/runners/gradle-plugin/gradle-plugin_main.iml @@ -22,20 +22,20 @@ </SOURCES> </library> </orderEntry> + <orderEntry type="module" module-name="ant_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-ide-common.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-script-runtime.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="core_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.14.1-all/8bnwg5hd3w55iofp58khbp6yv/gradle-2.14.1/lib/groovy-all-2.4.4.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-ide-common.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -44,17 +44,16 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/trove4j.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/jps-model.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="ant_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/protobuf-2.5.0-lite.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/jdom.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -63,7 +62,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-script-runtime.jar!/" /> + <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.14.1-all/8bnwg5hd3w55iofp58khbp6yv/gradle-2.14.1/lib/groovy-all-2.4.4.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -72,7 +71,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-compiler.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/asm-all.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -81,7 +80,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/picocontainer.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-compiler.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -90,17 +89,16 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/asm-all.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/picocontainer.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="cli_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/jdom.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/intellij-core-analysis.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -109,7 +107,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/markdown.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/trove4j.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -118,7 +116,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$USER_HOME$/.gradle/caches/2.14.1/generated-gradle-jars/gradle-api-2.14.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/protobuf-2.5.0-lite.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -127,24 +125,26 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/jps-model.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/markdown.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module" module-name="core_main" /> + <orderEntry type="module" module-name="cli_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/intellij-core-analysis.jar!/" /> + <root url="jar://$USER_HOME$/.gradle/caches/2.14.1/generated-gradle-jars/gradle-api-2.14.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M02-8" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M02-8" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M03" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M03" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: com.google.inject:guice:3.0" level="project" /> <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.8.3" level="project" /> <orderEntry type="library" name="Gradle: org.fusesource.jansi:jansi:1.11" level="project" /> diff --git a/.idea/modules/runners/gradle-plugin/gradle-plugin_test.iml b/.idea/modules/runners/gradle-plugin/gradle-plugin_test.iml index 39cf43ca..e6d80fb8 100644 --- a/.idea/modules/runners/gradle-plugin/gradle-plugin_test.iml +++ b/.idea/modules/runners/gradle-plugin/gradle-plugin_test.iml @@ -22,12 +22,10 @@ </SOURCES> </library> </orderEntry> - <orderEntry type="module" module-name="cli_main" /> - <orderEntry type="module" module-name="fatjar_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$USER_HOME$/.gradle/caches/2.14.1/generated-gradle-jars/gradle-api-2.14.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-compiler.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -42,11 +40,11 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="ant_main" /> + <orderEntry type="module" module-name="fatjar_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/jps-model.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-ide-common.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -55,7 +53,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/markdown.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/picocontainer.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -64,7 +62,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.14.1-all/8bnwg5hd3w55iofp58khbp6yv/gradle-2.14.1/lib/groovy-all-2.4.4.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/protobuf-2.5.0-lite.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -79,19 +77,21 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module" module-name="cli_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/picocontainer.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/jdom.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module" module-name="core_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/jdom.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/asm-all.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -100,7 +100,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-compiler.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/markdown.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -109,17 +109,16 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/intellij-core-analysis.jar!/" /> + <root url="jar://$USER_HOME$/.gradle/caches/2.14.1/generated-gradle-jars/gradle-api-2.14.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="core_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/protobuf-2.5.0-lite.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/jps-model.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -128,16 +127,17 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/asm-all.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/intellij-core-analysis.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module" module-name="ant_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-ide-common.jar!/" /> + <root url="jar://$USER_HOME$/.gradle/wrapper/dists/gradle-2.14.1-all/8bnwg5hd3w55iofp58khbp6yv/gradle-2.14.1/lib/groovy-all-2.4.4.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -145,9 +145,9 @@ </orderEntry> <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" /> <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M02-8" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M02-8" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M03" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M03" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: com.google.inject:guice:3.0" level="project" /> <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.8.3" level="project" /> <orderEntry type="library" name="Gradle: org.fusesource.jansi:jansi:1.11" level="project" /> diff --git a/.idea/modules/runners/maven-plugin/maven-plugin_main.iml b/.idea/modules/runners/maven-plugin/maven-plugin_main.iml index 350fbbc3..6f72d0eb 100644 --- a/.idea/modules/runners/maven-plugin/maven-plugin_main.iml +++ b/.idea/modules/runners/maven-plugin/maven-plugin_main.iml @@ -18,16 +18,17 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/jps-model.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/trove4j.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module" module-name="core_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/protobuf-2.5.0-lite.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/jdom.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -36,17 +37,16 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/picocontainer.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/protobuf-2.5.0-lite.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="ant_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-ide-common.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/intellij-core-analysis.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -55,7 +55,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/jdom.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-ide-common.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -64,7 +64,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/intellij-core-analysis.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/asm-all.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -73,7 +73,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/markdown.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/jps-model.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -82,22 +82,22 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/asm-all.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/markdown.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module" module-name="ant_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/trove4j.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/picocontainer.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="core_main" /> <orderEntry type="module-library"> <library> <CLASSES> @@ -136,13 +136,13 @@ <orderEntry type="library" name="Gradle: org.codehaus.plexus:plexus-component-annotations:1.5.5" level="project" /> <orderEntry type="library" name="Gradle: org.sonatype.plexus:plexus-sec-dispatcher:1.3" level="project" /> <orderEntry type="library" name="Gradle: org.sonatype.sisu:sisu-inject-bean:2.3.0" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M02-8" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M03" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: com.google.inject:guice:3.0" level="project" /> <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.8.3" level="project" /> <orderEntry type="library" name="Gradle: org.fusesource.jansi:jansi:1.11" level="project" /> <orderEntry type="library" name="Gradle: org.sonatype.sisu:sisu-guice:no_aop:3.1.0" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" /> <orderEntry type="library" name="Gradle: aopalliance:aopalliance:1.0" level="project" /> <orderEntry type="library" name="Gradle: org.sonatype.sisu.inject:cglib:2.2.1-v20090111" level="project" /> diff --git a/.idea/modules/runners/maven-plugin/maven-plugin_test.iml b/.idea/modules/runners/maven-plugin/maven-plugin_test.iml index 1154ced2..aec37eb0 100644 --- a/.idea/modules/runners/maven-plugin/maven-plugin_test.iml +++ b/.idea/modules/runners/maven-plugin/maven-plugin_test.iml @@ -25,7 +25,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/trove4j.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-ide-common.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -34,7 +34,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/picocontainer.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/asm-all.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -43,7 +43,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-ide-common.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/intellij-core-analysis.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -58,17 +58,17 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module" module-name="ant_main" /> + <orderEntry type="module" module-name="core_main" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/asm-all.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/picocontainer.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="core_main" /> - <orderEntry type="module" module-name="ant_main" /> <orderEntry type="module-library"> <library> <CLASSES> @@ -90,7 +90,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/intellij-core-analysis.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-script-runtime.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -99,7 +99,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-script-runtime.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-compiler.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -108,7 +108,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../lib/kotlin-compiler.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../lib/trove4j.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -134,13 +134,13 @@ <orderEntry type="library" name="Gradle: org.codehaus.plexus:plexus-component-annotations:1.5.5" level="project" /> <orderEntry type="library" name="Gradle: org.sonatype.plexus:plexus-sec-dispatcher:1.3" level="project" /> <orderEntry type="library" name="Gradle: org.sonatype.sisu:sisu-inject-bean:2.3.0" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M02-8" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.1-M03" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: com.google.inject:guice:3.0" level="project" /> <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.8.3" level="project" /> <orderEntry type="library" name="Gradle: org.fusesource.jansi:jansi:1.11" level="project" /> <orderEntry type="library" name="Gradle: org.sonatype.sisu:sisu-guice:no_aop:3.1.0" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M02-8" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1-M03" level="project" /> <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" /> <orderEntry type="library" name="Gradle: aopalliance:aopalliance:1.0" level="project" /> <orderEntry type="library" name="Gradle: org.sonatype.sisu.inject:cglib:2.2.1-v20090111" level="project" /> diff --git a/build.gradle b/build.gradle index 92811a1b..2e8bbba2 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ allprojects { mavenCentral() jcenter() maven { - url "https://dl.bintray.com/kotlin/kotlin-eap" + url "http://dl.bintray.com/kotlin/kotlin-eap-1.1" } maven { url "https://dl.bintray.com/kotlin/kotlin-dev" @@ -23,7 +23,7 @@ allprojects { mavenCentral() mavenLocal() maven { - url "https://dl.bintray.com/kotlin/kotlin-eap" + url "http://dl.bintray.com/kotlin/kotlin-eap-1.1" } maven { url "https://dl.bintray.com/kotlin/kotlin-dev" diff --git a/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt b/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt index 46fcb6c2..e365207c 100644 --- a/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt +++ b/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt @@ -31,6 +31,7 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.idea.resolve.ResolutionFacade import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.platform.JvmBuiltIns import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.resolve.BindingContext @@ -89,6 +90,8 @@ class AnalysisEnvironment(val messageCollector: MessageCollector) : Disposable { override val name: Name = Name.special("<module>") override fun dependencies(): List<ModuleInfo> = listOf(this) } + + val builtIns = JvmBuiltIns(projectContext.storageManager) val resolverForProject = JvmAnalyzerFacade.setupResolverForProject( "Dokka", projectContext, @@ -96,11 +99,15 @@ class AnalysisEnvironment(val messageCollector: MessageCollector) : Disposable { { ModuleContent(sourceFiles, GlobalSearchScope.allScope(environment.project)) }, JvmPlatformParameters { module }, CompilerEnvironment, - packagePartProviderFactory = { info, content -> JvmPackagePartProvider(environment, content.moduleContentScope) } + packagePartProviderFactory = { info, content -> JvmPackagePartProvider(environment, content.moduleContentScope) }, + builtIns = builtIns ) + val resolverForModule = resolverForProject.resolverForModule(module) - return DokkaResolutionFacade(environment.project, resolverForProject.descriptorForModule(module), resolverForModule) + val moduleDescriptor = resolverForProject.descriptorForModule(module) + builtIns.initialize(moduleDescriptor, true) + return DokkaResolutionFacade(environment.project, moduleDescriptor, resolverForModule) } /** @@ -168,6 +175,10 @@ fun contentRootFromPath(path: String): ContentRoot { class DokkaResolutionFacade(override val project: Project, override val moduleDescriptor: ModuleDescriptor, val resolverForModule: ResolverForModule) : ResolutionFacade { + override fun resolveToDescriptor(declaration: KtDeclaration, bodyResolveMode: BodyResolveMode): DeclarationDescriptor { + return resolveSession.resolveToDescriptor(declaration) + } + override fun analyze(elements: Collection<KtElement>, bodyResolveMode: BodyResolveMode): BindingContext { throw UnsupportedOperationException() } @@ -198,7 +209,4 @@ class DokkaResolutionFacade(override val project: Project, throw UnsupportedOperationException() } - override fun resolveToDescriptor(declaration: KtDeclaration): DeclarationDescriptor { - return resolveSession.resolveToDescriptor(declaration) - } } diff --git a/core/testdata/format/multipleTypeParameterConstraints.md b/core/testdata/format/multipleTypeParameterConstraints.md index 14f048f4..74532ffe 100644 --- a/core/testdata/format/multipleTypeParameterConstraints.md +++ b/core/testdata/format/multipleTypeParameterConstraints.md @@ -2,4 +2,4 @@ # f -`fun <T> f(): Unit where T : `[`Appendable`](http://docs.oracle.com/javase/6/docs/api/java/lang/Appendable.html)`, T : CharSequence`
\ No newline at end of file +`fun <T : CharSequence> f(): Unit`
\ No newline at end of file diff --git a/gradle.properties b/gradle.properties index bf6702d6..ac2cf1dd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ dokka_version=0.9.10 dokka_eap=false #Kotlin compiler and plugin -kotlin_version=1.1-M02-8 +kotlin_version=1.1-M03 ant_version=1.9.6 diff --git a/lib/asm-all.jar b/lib/asm-all.jar Binary files differindex 80031339..b2f2849b 100644 --- a/lib/asm-all.jar +++ b/lib/asm-all.jar diff --git a/lib/intellij-core-analysis.jar b/lib/intellij-core-analysis.jar Binary files differindex d351b70e..af40647f 100644 --- a/lib/intellij-core-analysis.jar +++ b/lib/intellij-core-analysis.jar diff --git a/lib/jdom.jar b/lib/jdom.jar Binary files differindex 09d88451..f1cf6ade 100644 --- a/lib/jdom.jar +++ b/lib/jdom.jar diff --git a/lib/jps-model.jar b/lib/jps-model.jar Binary files differindex 81eeee41..ca8fdce9 100644 --- a/lib/jps-model.jar +++ b/lib/jps-model.jar diff --git a/lib/kotlin-compiler.jar b/lib/kotlin-compiler.jar Binary files differindex 90d79469..d48835e9 100644 --- a/lib/kotlin-compiler.jar +++ b/lib/kotlin-compiler.jar diff --git a/lib/kotlin-ide-common.jar b/lib/kotlin-ide-common.jar Binary files differindex ee9932c8..74f0a9c1 100644 --- a/lib/kotlin-ide-common.jar +++ b/lib/kotlin-ide-common.jar diff --git a/lib/kotlin-script-runtime.jar b/lib/kotlin-script-runtime.jar Binary files differindex e7aef2de..9647d642 100644 --- a/lib/kotlin-script-runtime.jar +++ b/lib/kotlin-script-runtime.jar diff --git a/lib/markdown.jar b/lib/markdown.jar Binary files differindex ce2d26c0..09a640ec 100644 --- a/lib/markdown.jar +++ b/lib/markdown.jar diff --git a/lib/picocontainer.jar b/lib/picocontainer.jar Binary files differindex fbb1c925..babb5f21 100644 --- a/lib/picocontainer.jar +++ b/lib/picocontainer.jar diff --git a/lib/trove4j.jar b/lib/trove4j.jar Binary files differindex 93cf8ea9..2991ae55 100644 --- a/lib/trove4j.jar +++ b/lib/trove4j.jar |