@@ -29,10 +29,10 @@ buildscript {
2929}
3030
3131plugins {
32- id(" org.jetbrains.kotlin.jvm" ) version " 1.1.1 " // kept in sync with IntelliJ's bundled dep
32+ id(" org.jetbrains.kotlin.jvm" ) version " 1.1.3-2 " // kept in sync with IntelliJ's bundled dep
3333 groovy
3434 idea
35- id(" org.jetbrains.intellij" ) version " 0.2.13 "
35+ id(" org.jetbrains.intellij" ) version " 0.2.15 "
3636 id(" net.minecrell.licenser" ) version " 0.3"
3737}
3838
9191 }
9292}
9393
94- val gradleToolingExtension = java() .sourceSets[" gradle-tooling-extension" ]!!
94+ val gradleToolingExtension = java.sourceSets[" gradle-tooling-extension" ]!!
9595val gradleToolingExtensionJar = task<Jar >(gradleToolingExtension.jarTaskName) {
9696 from(gradleToolingExtension.output)
9797 classifier = " gradle-tooling-extension"
@@ -174,7 +174,7 @@ test {
174174idea {
175175 module {
176176 generatedSourceDirs.add(file(" gen" ))
177- excludeDirs.add(file(intellij() .sandboxDirectory))
177+ excludeDirs.add(file(intellij.sandboxDirectory))
178178 }
179179}
180180
@@ -246,13 +246,13 @@ val generate = task("generate") {
246246 outputs.dir(" gen" )
247247}
248248
249- java() .sourceSets[SourceSet .MAIN_SOURCE_SET_NAME ].java.srcDir(generate)
249+ java.sourceSets[SourceSet .MAIN_SOURCE_SET_NAME ].java.srcDir(generate)
250250
251251// Workaround for KT-16764
252252compileKotlin.inputs.dir(generate)
253253
254254runIde {
255- findProperty(" intellijJre" )?.let (this ::setExecutable)
255+ ( findProperty(" intellijJre" ) as ? String )?.let (this ::setExecutable)
256256
257257 System .getProperty(" debug" )?.let {
258258 systemProperty(" idea.ProcessCanceledException" , " disabled" )
@@ -261,7 +261,7 @@ runIde {
261261}
262262
263263inline operator fun <T : Task > T.invoke (a : T .() -> Unit ): T = apply (a)
264- fun KotlinDependencyHandler .kotlinModule (module : String ) = kotlinModule(module, kotlinVersion) as String
264+ fun DependencyHandlerScope .kotlinModule (module : String ) = kotlinModule(module, kotlinVersion) as String
265265fun intellijPlugin (name : String ) = mapOf (
266266 " group" to " org.jetbrains.plugins" ,
267267 " name" to name,
0 commit comments