Merge remote-tracking branch 'origin/pr/465'

Conflicts: libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
2014-05-28 12:12:07 +04:00
parent caeb978c7a 4bcfec1f7b
commit d6cc62e12c
23 changed files with 320 additions and 46 deletions
@@ -50,7 +50,7 @@
        <dependency>
            <groupId>org.jetbrains.kotlin</groupId>
            <artifactId>gradle-api</artifactId>
-            <version>1.4</version>
+            <version>1.6</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
@@ -198,4 +198,4 @@
            <url>http://repository.jetbrains.com/utils</url>
        </repository>
    </repositories>
-</project>
+</project>