diff options
author | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2016-11-24 14:34:11 +0300 |
---|---|---|
committer | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2016-11-24 14:34:11 +0300 |
commit | 31c563355515b9d3983edb20064960786ed502a7 (patch) | |
tree | 914cac5113268011c3f3f3e8fd0c459bae36f449 /.idea/modules/runners/android-gradle-plugin | |
parent | d8be364a89ab7d9f38196ef17d0d4eb1d9659b48 (diff) | |
download | dokka-31c563355515b9d3983edb20064960786ed502a7.tar.gz dokka-31c563355515b9d3983edb20064960786ed502a7.tar.bz2 dokka-31c563355515b9d3983edb20064960786ed502a7.zip |
Updated kotlin-compiler to 1.1-M03 and fixed configuration
Diffstat (limited to '.idea/modules/runners/android-gradle-plugin')
-rw-r--r-- | .idea/modules/runners/android-gradle-plugin/android-gradle-plugin_main.iml | 48 | ||||
-rw-r--r-- | .idea/modules/runners/android-gradle-plugin/android-gradle-plugin_test.iml | 48 |
2 files changed, 48 insertions, 48 deletions
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" /> |