diff options
| -rw-r--r-- | .idea/compiler.xml | 2 | ||||
| -rw-r--r-- | .idea/modules.xml | 3 | ||||
| -rw-r--r-- | gradle.properties | 2 | ||||
| -rw-r--r-- | lib/intellij-core-analysis.jar | bin | 38693094 -> 38693094 bytes | |||
| -rw-r--r-- | lib/jdom.jar | bin | 324832 -> 324832 bytes | |||
| -rw-r--r-- | lib/jps-model.jar | bin | 1018680 -> 1018680 bytes | |||
| -rw-r--r-- | lib/kotlin-compiler.jar | bin | 21207535 -> 22223675 bytes | |||
| -rw-r--r-- | lib/kotlin-ide-common.jar | bin | 440457 -> 446805 bytes | |||
| -rw-r--r-- | lib/kotlin-script-runtime.jar | bin | 3290 -> 3352 bytes | |||
| -rw-r--r-- | lib/picocontainer.jar | bin | 231869 -> 231869 bytes | |||
| -rw-r--r-- | lib/trove4j.jar | bin | 1167879 -> 1167879 bytes |
11 files changed, 6 insertions, 1 deletions
diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 122511cc..3826f563 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -45,6 +45,8 @@ <module name="fatjar_test" target="1.8" /> <module name="gradle-plugin_main" target="1.6" /> <module name="gradle-plugin_test" target="1.6" /> + <module name="integration_main" target="1.8" /> + <module name="integration_test" target="1.8" /> <module name="maven-plugin" target="1.5" /> <module name="maven-plugin_main" target="1.8" /> <module name="maven-plugin_test" target="1.8" /> diff --git a/.idea/modules.xml b/.idea/modules.xml index d04c6fb2..eaa3a486 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -24,6 +24,9 @@ <module fileurl="file://$PROJECT_DIR$/.idea/modules/runners/gradle-plugin/gradle-plugin.iml" filepath="$PROJECT_DIR$/.idea/modules/runners/gradle-plugin/gradle-plugin.iml" group="runners/gradle-plugin" /> <module fileurl="file://$PROJECT_DIR$/.idea/modules/runners/gradle-plugin/gradle-plugin_main.iml" filepath="$PROJECT_DIR$/.idea/modules/runners/gradle-plugin/gradle-plugin_main.iml" group="runners/gradle-plugin" /> <module fileurl="file://$PROJECT_DIR$/.idea/modules/runners/gradle-plugin/gradle-plugin_test.iml" filepath="$PROJECT_DIR$/.idea/modules/runners/gradle-plugin/gradle-plugin_test.iml" group="runners/gradle-plugin" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/integration/integration.iml" filepath="$PROJECT_DIR$/.idea/modules/integration/integration.iml" group="integration" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/integration/integration_main.iml" filepath="$PROJECT_DIR$/.idea/modules/integration/integration_main.iml" group="integration" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/integration/integration_test.iml" filepath="$PROJECT_DIR$/.idea/modules/integration/integration_test.iml" group="integration" /> <module fileurl="file://$PROJECT_DIR$/.idea/modules/runners/maven-plugin/maven-plugin.iml" filepath="$PROJECT_DIR$/.idea/modules/runners/maven-plugin/maven-plugin.iml" group="runners/maven-plugin" /> <module fileurl="file://$PROJECT_DIR$/.idea/modules/runners/maven-plugin/maven-plugin_main.iml" filepath="$PROJECT_DIR$/.idea/modules/runners/maven-plugin/maven-plugin_main.iml" group="runners/maven-plugin" /> <module fileurl="file://$PROJECT_DIR$/.idea/modules/runners/maven-plugin/maven-plugin_test.iml" filepath="$PROJECT_DIR$/.idea/modules/runners/maven-plugin/maven-plugin_test.iml" group="runners/maven-plugin" /> diff --git a/gradle.properties b/gradle.properties index d0802eb0..1ea90414 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ dokka_version=0.9.11 dokka_publication_channel=dokka #Kotlin compiler and plugin -kotlin_version=1.1-M03 +kotlin_version=1.1-M04 ant_version=1.9.6 diff --git a/lib/intellij-core-analysis.jar b/lib/intellij-core-analysis.jar Binary files differindex af40647f..bb89df3a 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 f1cf6ade..8de217d2 100644 --- a/lib/jdom.jar +++ b/lib/jdom.jar diff --git a/lib/jps-model.jar b/lib/jps-model.jar Binary files differindex ca8fdce9..359433a4 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 d48835e9..36d98dc5 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 74f0a9c1..6aa8b496 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 9647d642..8815c5db 100644 --- a/lib/kotlin-script-runtime.jar +++ b/lib/kotlin-script-runtime.jar diff --git a/lib/picocontainer.jar b/lib/picocontainer.jar Binary files differindex babb5f21..8cc07156 100644 --- a/lib/picocontainer.jar +++ b/lib/picocontainer.jar diff --git a/lib/trove4j.jar b/lib/trove4j.jar Binary files differindex 2991ae55..cf6ef6af 100644 --- a/lib/trove4j.jar +++ b/lib/trove4j.jar |