From 8a82c1618cb6278e77c632b9a387e78b97fb931e Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Sat, 24 Mar 2018 22:55:55 +0300
Subject: [PATCH] Use Plugins DSL in Kotlin Gradle scripts

When plugins DSL is used, there is no need to
manually generate typesafe accessors for extensions and
conventions (by running `./gradlew kotlinDslAccessorsSnapshot`).
---
 ant/build.gradle.kts                                      | 4 +++-
 build-common/build.gradle.kts                             | 6 ++++--
 build.gradle.kts                                          | 3 +--
 compiler/android-tests/build.gradle.kts                   | 6 ++++--
 compiler/backend-common/build.gradle.kts                  | 6 ++++--
 compiler/backend/build.gradle.kts                         | 6 ++++--
 compiler/build.gradle.kts                                 | 6 ++++--
 compiler/cli/build.gradle.kts                             | 6 ++++--
 compiler/cli/cli-common/build.gradle.kts                  | 6 ++++--
 compiler/cli/cli-runner/build.gradle.kts                  | 6 ++++--
 compiler/compiler-runner/build.gradle.kts                 | 6 ++++--
 compiler/conditional-preprocessor/build.gradle.kts        | 6 ++++--
 compiler/container/build.gradle.kts                       | 6 ++++--
 compiler/daemon/build.gradle.kts                          | 6 ++++--
 compiler/daemon/daemon-client/build.gradle.kts            | 6 ++++--
 compiler/daemon/daemon-common/build.gradle.kts            | 6 ++++--
 compiler/frontend.java/build.gradle.kts                   | 6 ++++--
 compiler/frontend.script/build.gradle.kts                 | 6 ++++--
 compiler/frontend/build.gradle.kts                        | 6 ++++--
 compiler/incremental-compilation-impl/build.gradle.kts    | 6 ++++--
 compiler/ir/backend.js/build.gradle.kts                   | 6 ++++--
 compiler/ir/ir.ir2cfg/build.gradle.kts                    | 6 ++++--
 compiler/ir/ir.psi2ir/build.gradle.kts                    | 6 ++++--
 compiler/ir/ir.tree/build.gradle.kts                      | 6 ++++--
 compiler/light-classes/build.gradle.kts                   | 6 ++++--
 compiler/plugin-api/build.gradle.kts                      | 6 ++++--
 compiler/preloader/build.gradle.kts                       | 6 ++++--
 compiler/psi/build.gradle.kts                             | 6 ++++--
 compiler/resolution/build.gradle.kts                      | 6 ++++--
 compiler/serialization/build.gradle.kts                   | 6 ++++--
 compiler/tests-common-jvm6/build.gradle.kts               | 6 ++++--
 compiler/tests-common/build.gradle.kts                    | 6 ++++--
 compiler/tests-ir-jvm/build.gradle.kts                    | 6 ++++--
 compiler/tests-java8/build.gradle.kts                     | 6 ++++--
 compiler/util/build.gradle.kts                            | 6 ++++--
 core/descriptors.jvm/build.gradle.kts                     | 6 ++++--
 core/descriptors.runtime/build.gradle.kts                 | 4 +++-
 core/descriptors/build.gradle.kts                         | 6 ++++--
 core/deserialization/build.gradle.kts                     | 6 ++++--
 core/metadata.jvm/build.gradle.kts                        | 6 ++++--
 core/metadata/build.gradle.kts                            | 6 ++++--
 core/util.runtime/build.gradle.kts                        | 8 ++++----
 custom-dependencies/protobuf-relocated/build.gradle.kts   | 4 +++-
 eval4j/build.gradle.kts                                   | 6 ++++--
 generators/build.gradle.kts                               | 6 ++++--
 generators/test-generator/build.gradle.kts                | 6 ++++--
 idea-runner/build.gradle.kts                              | 6 ++++--
 idea/build.gradle.kts                                     | 6 ++++--
 idea/formatter/build.gradle.kts                           | 6 ++++--
 idea/ide-common/build.gradle.kts                          | 6 ++++--
 idea/idea-android/build.gradle.kts                        | 6 ++++--
 .../idea-android-output-parser/build.gradle.kts           | 4 +++-
 idea/idea-core/build.gradle.kts                           | 6 ++++--
 idea/idea-gradle/build.gradle.kts                         | 6 ++++--
 idea/idea-jps-common/build.gradle.kts                     | 6 ++++--
 idea/idea-jvm/build.gradle.kts                            | 6 ++++--
 idea/idea-maven/build.gradle.kts                          | 6 ++++--
 idea/idea-test-framework/build.gradle.kts                 | 6 ++++--
 idea/kotlin-gradle-tooling/build.gradle.kts               | 6 ++++--
 j2k/build.gradle.kts                                      | 6 ++++--
 jps-plugin/build.gradle.kts                               | 6 ++++--
 js/js.ast/build.gradle.kts                                | 6 ++++--
 js/js.dce/build.gradle.kts                                | 6 ++++--
 js/js.frontend/build.gradle.kts                           | 6 ++++--
 js/js.parser/build.gradle.kts                             | 6 ++++--
 js/js.serializer/build.gradle.kts                         | 6 ++++--
 js/js.tests/build.gradle.kts                              | 5 ++---
 js/js.translator/build.gradle.kts                         | 5 ++---
 .../annotation-processor-example/build.gradle.kts         | 6 +++---
 .../build.gradle.kts                                      | 4 +++-
 .../examples/kotlin-jsr223-local-example/build.gradle.kts | 4 +++-
 libraries/stdlib/jvm-minimal-for-test/build.gradle.kts    | 4 +++-
 .../tools/kotlin-annotation-processing/build.gradle.kts   | 4 +++-
 .../tools/kotlin-annotations-android/build.gradle.kts     | 4 +++-
 libraries/tools/kotlin-script-util/build.gradle.kts       | 6 ++++--
 plugins/allopen/allopen-cli/build.gradle.kts              | 6 ++++--
 plugins/allopen/allopen-ide/build.gradle.kts              | 6 ++++--
 .../android-extensions-compiler/build.gradle.kts          | 6 ++++--
 .../android-extensions-idea/build.gradle.kts              | 6 ++++--
 .../android-extensions-jps/build.gradle.kts               | 6 ++++--
 .../android-extensions-runtime/build.gradle.kts           | 6 ++++--
 .../build.gradle.kts                                      | 6 ++++--
 plugins/kapt3/kapt3-compiler/build.gradle.kts             | 6 ++++--
 plugins/kapt3/kapt3-idea/build.gradle.kts                 | 6 ++++--
 plugins/kapt3/kapt3-runtime/build.gradle.kts              | 6 ++++--
 plugins/lint/build.gradle.kts                             | 8 ++++----
 plugins/noarg/noarg-cli/build.gradle.kts                  | 6 ++++--
 plugins/noarg/noarg-ide/build.gradle.kts                  | 6 ++++--
 plugins/pill/generate-all-tests/build.gradle.kts          | 6 ++++--
 .../sam-with-receiver-cli/build.gradle.kts                | 6 ++++--
 .../sam-with-receiver-ide/build.gradle.kts                | 6 ++++--
 .../source-sections-compiler/build.gradle.kts             | 6 ++++--
 plugins/uast-kotlin-idea/build.gradle.kts                 | 6 ++++--
 plugins/uast-kotlin/build.gradle.kts                      | 6 ++++--
 .../android-extensions-compiler-gradle/build.gradle.kts   | 4 +++-
 prepare/android-lint/build.gradle.kts                     | 4 +++-
 prepare/compiler-client-embeddable/build.gradle.kts       | 3 +--
 prepare/formatter/build.gradle.kts                        | 4 +++-
 prepare/ide-lazy-resolver/build.gradle.kts                | 4 +++-
 test-instrumenter/build.gradle.kts                        | 6 ++++--
 ultimate/build.gradle.kts                                 | 4 ++--
 ultimate/ultimate-runner/build.gradle.kts                 | 4 +++-
 102 files changed, 381 insertions(+), 197 deletions(-)

diff --git a/ant/build.gradle.kts b/ant/build.gradle.kts
index 637e2f5e6c8..0378e42116a 100644
--- a/ant/build.gradle.kts
+++ b/ant/build.gradle.kts
@@ -1,7 +1,9 @@
 
 description = "Kotlin Ant Tools"
 
-apply { plugin("kotlin") }
+plugins {
+    kotlin("jvm")
+}
 
 dependencies {
     compile(commonDep("org.apache.ant", "ant"))
diff --git a/build-common/build.gradle.kts b/build-common/build.gradle.kts
index aeefc791f57..b84dbc23abb 100644
--- a/build-common/build.gradle.kts
+++ b/build-common/build.gradle.kts
@@ -1,8 +1,10 @@
 
 description = "Kotlin Build Common"
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compileOnly(project(":core:util.runtime"))
diff --git a/build.gradle.kts b/build.gradle.kts
index 5ffdb1358e0..7caa71c9896 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -45,6 +45,7 @@ buildscript {
 plugins {
     `build-scan`
     idea
+    id("jps-compatible")
 }
 
 buildScan {
@@ -254,8 +255,6 @@ apply {
     }
 }
 
-apply { plugin("jps-compatible") }
-
 fun Project.allprojectsRecursive(body: Project.() -> Unit) {
     this.body()
     this.subprojects { allprojectsRecursive(body) }
diff --git a/compiler/android-tests/build.gradle.kts b/compiler/android-tests/build.gradle.kts
index 527d41255ea..0e8300d604c 100644
--- a/compiler/android-tests/build.gradle.kts
+++ b/compiler/android-tests/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/backend-common/build.gradle.kts b/compiler/backend-common/build.gradle.kts
index db9cedcdbae..f59e8662a79 100644
--- a/compiler/backend-common/build.gradle.kts
+++ b/compiler/backend-common/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/backend/build.gradle.kts b/compiler/backend/build.gradle.kts
index 8016c36fb5f..bbd1cca4afd 100644
--- a/compiler/backend/build.gradle.kts
+++ b/compiler/backend/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index 6f45e9598cc..f40411e9378 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -3,8 +3,10 @@ import java.io.File
 import org.gradle.api.tasks.bundling.Jar
 import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/cli/build.gradle.kts b/compiler/cli/build.gradle.kts
index bcdd49c5913..7726ad01a5e 100644
--- a/compiler/cli/build.gradle.kts
+++ b/compiler/cli/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.8"
 
diff --git a/compiler/cli/cli-common/build.gradle.kts b/compiler/cli/cli-common/build.gradle.kts
index 54793af9984..bc65a247679 100644
--- a/compiler/cli/cli-common/build.gradle.kts
+++ b/compiler/cli/cli-common/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/cli/cli-runner/build.gradle.kts b/compiler/cli/cli-runner/build.gradle.kts
index dbd7b9095d5..12c73eca97f 100644
--- a/compiler/cli/cli-runner/build.gradle.kts
+++ b/compiler/cli/cli-runner/build.gradle.kts
@@ -1,8 +1,10 @@
 
 description = "Kotlin Runner"
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/compiler-runner/build.gradle.kts b/compiler/compiler-runner/build.gradle.kts
index b71e2016fbc..d01a85dd572 100644
--- a/compiler/compiler-runner/build.gradle.kts
+++ b/compiler/compiler-runner/build.gradle.kts
@@ -3,8 +3,10 @@ import org.gradle.jvm.tasks.Jar
 
 description = "Compiler runner + daemon client"
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/conditional-preprocessor/build.gradle.kts b/compiler/conditional-preprocessor/build.gradle.kts
index 6c31ce6c1f7..4872a0bc7bf 100644
--- a/compiler/conditional-preprocessor/build.gradle.kts
+++ b/compiler/conditional-preprocessor/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/container/build.gradle.kts b/compiler/container/build.gradle.kts
index 34ab0dc181e..d4149d80a2a 100644
--- a/compiler/container/build.gradle.kts
+++ b/compiler/container/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/daemon/build.gradle.kts b/compiler/daemon/build.gradle.kts
index 16ddf7cc3b8..73192de66f7 100644
--- a/compiler/daemon/build.gradle.kts
+++ b/compiler/daemon/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/daemon/daemon-client/build.gradle.kts b/compiler/daemon/daemon-client/build.gradle.kts
index 28e2ee893c2..613e9209b85 100644
--- a/compiler/daemon/daemon-client/build.gradle.kts
+++ b/compiler/daemon/daemon-client/build.gradle.kts
@@ -2,8 +2,10 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 description = "Kotlin Daemon Client"
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/daemon/daemon-common/build.gradle.kts b/compiler/daemon/daemon-common/build.gradle.kts
index c254c6e150c..58551fbef30 100644
--- a/compiler/daemon/daemon-common/build.gradle.kts
+++ b/compiler/daemon/daemon-common/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/frontend.java/build.gradle.kts b/compiler/frontend.java/build.gradle.kts
index fd9535887b2..3917f2b3c12 100644
--- a/compiler/frontend.java/build.gradle.kts
+++ b/compiler/frontend.java/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/frontend.script/build.gradle.kts b/compiler/frontend.script/build.gradle.kts
index 03e97cbf1b1..733e344f803 100644
--- a/compiler/frontend.script/build.gradle.kts
+++ b/compiler/frontend.script/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/frontend/build.gradle.kts b/compiler/frontend/build.gradle.kts
index 4d56b8dac0c..a2079fe4b8d 100644
--- a/compiler/frontend/build.gradle.kts
+++ b/compiler/frontend/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/incremental-compilation-impl/build.gradle.kts b/compiler/incremental-compilation-impl/build.gradle.kts
index 1f1fa5e1493..12718d3ac94 100644
--- a/compiler/incremental-compilation-impl/build.gradle.kts
+++ b/compiler/incremental-compilation-impl/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/ir/backend.js/build.gradle.kts b/compiler/ir/backend.js/build.gradle.kts
index fe35c3eff00..63c49a19f8a 100644
--- a/compiler/ir/backend.js/build.gradle.kts
+++ b/compiler/ir/backend.js/build.gradle.kts
@@ -1,5 +1,7 @@
-plugins { kotlin("jvm") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/ir/ir.ir2cfg/build.gradle.kts b/compiler/ir/ir.ir2cfg/build.gradle.kts
index 8f8e2bf27f7..5b48d116656 100644
--- a/compiler/ir/ir.ir2cfg/build.gradle.kts
+++ b/compiler/ir/ir.ir2cfg/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/ir/ir.psi2ir/build.gradle.kts b/compiler/ir/ir.psi2ir/build.gradle.kts
index 362785ebeff..8f244039c41 100644
--- a/compiler/ir/ir.psi2ir/build.gradle.kts
+++ b/compiler/ir/ir.psi2ir/build.gradle.kts
@@ -1,5 +1,7 @@
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/ir/ir.tree/build.gradle.kts b/compiler/ir/ir.tree/build.gradle.kts
index 59ace3614da..6c09fbf9b90 100644
--- a/compiler/ir/ir.tree/build.gradle.kts
+++ b/compiler/ir/ir.tree/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/light-classes/build.gradle.kts b/compiler/light-classes/build.gradle.kts
index eb2f0b3bae8..5f931fe8869 100644
--- a/compiler/light-classes/build.gradle.kts
+++ b/compiler/light-classes/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/plugin-api/build.gradle.kts b/compiler/plugin-api/build.gradle.kts
index 173fdce4079..c34e43582e0 100644
--- a/compiler/plugin-api/build.gradle.kts
+++ b/compiler/plugin-api/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/preloader/build.gradle.kts b/compiler/preloader/build.gradle.kts
index c63d0def4c7..388036d9d39 100644
--- a/compiler/preloader/build.gradle.kts
+++ b/compiler/preloader/build.gradle.kts
@@ -1,8 +1,10 @@
 
 description = "Kotlin Preloader"
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/psi/build.gradle.kts b/compiler/psi/build.gradle.kts
index 33a88adb524..5315aa5f8e5 100644
--- a/compiler/psi/build.gradle.kts
+++ b/compiler/psi/build.gradle.kts
@@ -4,8 +4,10 @@
  */
 
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 
 jvmTarget = "1.6"
diff --git a/compiler/resolution/build.gradle.kts b/compiler/resolution/build.gradle.kts
index 65a6ab63d34..b3f06407a07 100644
--- a/compiler/resolution/build.gradle.kts
+++ b/compiler/resolution/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/serialization/build.gradle.kts b/compiler/serialization/build.gradle.kts
index 170df193680..d49eb1f2f2c 100644
--- a/compiler/serialization/build.gradle.kts
+++ b/compiler/serialization/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/tests-common-jvm6/build.gradle.kts b/compiler/tests-common-jvm6/build.gradle.kts
index acb76c9fe65..642f111e36c 100644
--- a/compiler/tests-common-jvm6/build.gradle.kts
+++ b/compiler/tests-common-jvm6/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts
index fbb03a6e4cd..6d3c9e060bd 100644
--- a/compiler/tests-common/build.gradle.kts
+++ b/compiler/tests-common/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     testCompile(project(":core:descriptors"))
diff --git a/compiler/tests-ir-jvm/build.gradle.kts b/compiler/tests-ir-jvm/build.gradle.kts
index aa76b08ec88..7beea0fcfe5 100644
--- a/compiler/tests-ir-jvm/build.gradle.kts
+++ b/compiler/tests-ir-jvm/build.gradle.kts
@@ -1,5 +1,7 @@
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     testRuntime(intellijDep())
diff --git a/compiler/tests-java8/build.gradle.kts b/compiler/tests-java8/build.gradle.kts
index f36d657b76e..54598438356 100644
--- a/compiler/tests-java8/build.gradle.kts
+++ b/compiler/tests-java8/build.gradle.kts
@@ -1,7 +1,9 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     testCompile(projectTests(":compiler:tests-common"))
diff --git a/compiler/util/build.gradle.kts b/compiler/util/build.gradle.kts
index ad06af501f0..1c56f2f8f4e 100644
--- a/compiler/util/build.gradle.kts
+++ b/compiler/util/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/core/descriptors.jvm/build.gradle.kts b/core/descriptors.jvm/build.gradle.kts
index 1236d950e5e..47307375158 100644
--- a/core/descriptors.jvm/build.gradle.kts
+++ b/core/descriptors.jvm/build.gradle.kts
@@ -1,5 +1,7 @@
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String
diff --git a/core/descriptors.runtime/build.gradle.kts b/core/descriptors.runtime/build.gradle.kts
index 8b765ab965a..9ac94724366 100644
--- a/core/descriptors.runtime/build.gradle.kts
+++ b/core/descriptors.runtime/build.gradle.kts
@@ -1,6 +1,8 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-apply { plugin("kotlin") }
+plugins {
+    kotlin("jvm")
+}
 
 dependencies {
     compileOnly(project(":core:util.runtime"))
diff --git a/core/descriptors/build.gradle.kts b/core/descriptors/build.gradle.kts
index 32cc74f2e94..b8cfae9417b 100644
--- a/core/descriptors/build.gradle.kts
+++ b/core/descriptors/build.gradle.kts
@@ -1,5 +1,7 @@
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String
diff --git a/core/deserialization/build.gradle.kts b/core/deserialization/build.gradle.kts
index 8fbb322dd54..e6c0e6dc127 100644
--- a/core/deserialization/build.gradle.kts
+++ b/core/deserialization/build.gradle.kts
@@ -1,5 +1,7 @@
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String
diff --git a/core/metadata.jvm/build.gradle.kts b/core/metadata.jvm/build.gradle.kts
index e7c115a9d9e..20c824b80f0 100644
--- a/core/metadata.jvm/build.gradle.kts
+++ b/core/metadata.jvm/build.gradle.kts
@@ -1,5 +1,7 @@
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String
diff --git a/core/metadata/build.gradle.kts b/core/metadata/build.gradle.kts
index 0fb8ae14e3e..8ea40fca9e0 100644
--- a/core/metadata/build.gradle.kts
+++ b/core/metadata/build.gradle.kts
@@ -1,7 +1,9 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String
diff --git a/core/util.runtime/build.gradle.kts b/core/util.runtime/build.gradle.kts
index 9c880e9f56f..a6d9d917b3e 100644
--- a/core/util.runtime/build.gradle.kts
+++ b/core/util.runtime/build.gradle.kts
@@ -1,8 +1,8 @@
 
-apply {
-    plugin("java")
-    plugin("kotlin")
-    plugin("jps-compatible")
+plugins {
+    java
+    kotlin("jvm")
+    id("jps-compatible")
 }
 
 jvmTarget = "1.6"
diff --git a/custom-dependencies/protobuf-relocated/build.gradle.kts b/custom-dependencies/protobuf-relocated/build.gradle.kts
index 06296e68ea7..e36d6e4fd45 100644
--- a/custom-dependencies/protobuf-relocated/build.gradle.kts
+++ b/custom-dependencies/protobuf-relocated/build.gradle.kts
@@ -1,7 +1,9 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import java.io.File
 
-apply { plugin("base") }
+plugins {
+    base
+}
 
 val baseProtobuf by configurations.creating
 val baseProtobufSources by configurations.creating
diff --git a/eval4j/build.gradle.kts b/eval4j/build.gradle.kts
index 453f5c92ef7..94f823816c7 100644
--- a/eval4j/build.gradle.kts
+++ b/eval4j/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(projectDist(":kotlin-stdlib"))
diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts
index 766f6dc59de..b6ff576fbe0 100644
--- a/generators/build.gradle.kts
+++ b/generators/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(projectTests(":compiler:cli"))
diff --git a/generators/test-generator/build.gradle.kts b/generators/test-generator/build.gradle.kts
index 05bbd283ce5..3f89e930239 100644
--- a/generators/test-generator/build.gradle.kts
+++ b/generators/test-generator/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/idea-runner/build.gradle.kts b/idea-runner/build.gradle.kts
index c240ef8821c..2c211fb34d4 100644
--- a/idea-runner/build.gradle.kts
+++ b/idea-runner/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compileOnly(project(":idea"))
diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts
index ca6b1dcae31..434e66e7be0 100644
--- a/idea/build.gradle.kts
+++ b/idea/build.gradle.kts
@@ -1,7 +1,9 @@
 import org.gradle.jvm.tasks.Jar
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     testRuntime(intellijDep())
diff --git a/idea/formatter/build.gradle.kts b/idea/formatter/build.gradle.kts
index 8a5b1580c25..b8ec973c87d 100644
--- a/idea/formatter/build.gradle.kts
+++ b/idea/formatter/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(project(":compiler:util"))
diff --git a/idea/ide-common/build.gradle.kts b/idea/ide-common/build.gradle.kts
index 526414f7028..b498bdd0649 100644
--- a/idea/ide-common/build.gradle.kts
+++ b/idea/ide-common/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(project(":compiler:util"))
diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts
index c03fd89382c..0ae609c5702 100644
--- a/idea/idea-android/build.gradle.kts
+++ b/idea/idea-android/build.gradle.kts
@@ -1,8 +1,10 @@
 
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     testRuntime(intellijDep())
diff --git a/idea/idea-android/idea-android-output-parser/build.gradle.kts b/idea/idea-android/idea-android-output-parser/build.gradle.kts
index 794145a8ca1..336ac76bb14 100644
--- a/idea/idea-android/idea-android-output-parser/build.gradle.kts
+++ b/idea/idea-android/idea-android-output-parser/build.gradle.kts
@@ -1,5 +1,7 @@
 
-apply { plugin("kotlin") }
+plugins {
+    kotlin("jvm")
+}
 
 dependencies {
     compile(project(":compiler:util"))
diff --git a/idea/idea-core/build.gradle.kts b/idea/idea-core/build.gradle.kts
index 16a9a80dc00..929aa71528a 100644
--- a/idea/idea-core/build.gradle.kts
+++ b/idea/idea-core/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(projectDist(":kotlin-stdlib"))
diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts
index 916b49cab34..5f6d36486dc 100644
--- a/idea/idea-gradle/build.gradle.kts
+++ b/idea/idea-gradle/build.gradle.kts
@@ -1,5 +1,7 @@
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     testRuntime(intellijDep())
diff --git a/idea/idea-jps-common/build.gradle.kts b/idea/idea-jps-common/build.gradle.kts
index 43e3ac5ffd8..0503add5fff 100644
--- a/idea/idea-jps-common/build.gradle.kts
+++ b/idea/idea-jps-common/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(projectDist(":kotlin-stdlib"))
diff --git a/idea/idea-jvm/build.gradle.kts b/idea/idea-jvm/build.gradle.kts
index cac598ece73..7b8fec248dc 100644
--- a/idea/idea-jvm/build.gradle.kts
+++ b/idea/idea-jvm/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(project(":idea"))
diff --git a/idea/idea-maven/build.gradle.kts b/idea/idea-maven/build.gradle.kts
index 42ac16a7499..ff3ebf9578d 100644
--- a/idea/idea-maven/build.gradle.kts
+++ b/idea/idea-maven/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(project(":core:util.runtime"))
diff --git a/idea/idea-test-framework/build.gradle.kts b/idea/idea-test-framework/build.gradle.kts
index c4010a0138e..ad64b6d5384 100644
--- a/idea/idea-test-framework/build.gradle.kts
+++ b/idea/idea-test-framework/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     testCompile(project(":compiler:frontend"))
diff --git a/idea/kotlin-gradle-tooling/build.gradle.kts b/idea/kotlin-gradle-tooling/build.gradle.kts
index ede2afbd2f5..1a622bd3853 100644
--- a/idea/kotlin-gradle-tooling/build.gradle.kts
+++ b/idea/kotlin-gradle-tooling/build.gradle.kts
@@ -1,8 +1,10 @@
 
 description = "Kotlin Gradle Tooling support"
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts
index ce92e315a7a..f350fc3c859 100644
--- a/j2k/build.gradle.kts
+++ b/j2k/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     testRuntime(intellijDep())
diff --git a/jps-plugin/build.gradle.kts b/jps-plugin/build.gradle.kts
index a0147cf66bd..2cc84804d61 100644
--- a/jps-plugin/build.gradle.kts
+++ b/jps-plugin/build.gradle.kts
@@ -1,5 +1,7 @@
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 val compilerModules: Array<String> by rootProject.extra
 
diff --git a/js/js.ast/build.gradle.kts b/js/js.ast/build.gradle.kts
index 0c00ccc8cfb..64679287fe2 100644
--- a/js/js.ast/build.gradle.kts
+++ b/js/js.ast/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/js/js.dce/build.gradle.kts b/js/js.dce/build.gradle.kts
index 446e590a2ff..bd20caedd3e 100644
--- a/js/js.dce/build.gradle.kts
+++ b/js/js.dce/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(project(":compiler:util"))
diff --git a/js/js.frontend/build.gradle.kts b/js/js.frontend/build.gradle.kts
index 509f2746612..f24c2acd488 100644
--- a/js/js.frontend/build.gradle.kts
+++ b/js/js.frontend/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/js/js.parser/build.gradle.kts b/js/js.parser/build.gradle.kts
index e9aeacd5032..14884a562ac 100644
--- a/js/js.parser/build.gradle.kts
+++ b/js/js.parser/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(project(":compiler:util"))
diff --git a/js/js.serializer/build.gradle.kts b/js/js.serializer/build.gradle.kts
index db575bed77c..368d7e00ef8 100644
--- a/js/js.serializer/build.gradle.kts
+++ b/js/js.serializer/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts
index 0d23dd501d6..bfd72900d1f 100644
--- a/js/js.tests/build.gradle.kts
+++ b/js/js.tests/build.gradle.kts
@@ -3,6 +3,8 @@ import com.moowork.gradle.node.npm.NpmExecRunner
 import com.moowork.gradle.node.npm.NpmTask
 
 plugins {
+    kotlin("jvm")
+    id("jps-compatible")
     id("com.moowork.node").version("1.2.0")
 }
 
@@ -10,9 +12,6 @@ node {
     download = true
 }
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
-
 val antLauncherJar by configurations.creating
 
 dependencies {
diff --git a/js/js.translator/build.gradle.kts b/js/js.translator/build.gradle.kts
index 18953c3654d..79d4a66f22a 100644
--- a/js/js.translator/build.gradle.kts
+++ b/js/js.translator/build.gradle.kts
@@ -2,11 +2,10 @@ import org.gradle.plugins.ide.idea.model.IdeaModel
 
 plugins {
     idea
+    kotlin("jvm")
+    id("jps-compatible")
 }
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
-
 jvmTarget = "1.6"
 
 dependencies {
diff --git a/libraries/examples/annotation-processor-example/build.gradle.kts b/libraries/examples/annotation-processor-example/build.gradle.kts
index e1518c35a7c..b6f10bea64f 100644
--- a/libraries/examples/annotation-processor-example/build.gradle.kts
+++ b/libraries/examples/annotation-processor-example/build.gradle.kts
@@ -1,8 +1,8 @@
 description = "Simple Annotation Processor for testing kapt"
 
-apply {
-    plugin("kotlin")
-    plugin("maven") // only used for installing to mavenLocal()
+plugins {
+    kotlin("jvm")
+    maven // only used for installing to mavenLocal()
 }
 
 dependencies {
diff --git a/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts b/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts
index 98095f00d97..33f49373efa 100644
--- a/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts
+++ b/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts
@@ -1,7 +1,9 @@
 
 description = "Sample Kotlin JSR 223 scripting jar with daemon (out-of-process) compilation and local (in-process) evaluation"
 
-apply { plugin("kotlin") }
+plugins {
+    kotlin("jvm")
+}
 
 val compilerClasspath by configurations.creating
 
diff --git a/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts b/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts
index 9a78d93e04d..0964549b476 100644
--- a/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts
+++ b/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts
@@ -1,7 +1,9 @@
 
 description = "Sample Kotlin JSR 223 scripting jar with local (in-process) compilation and evaluation"
 
-apply { plugin("kotlin") }
+plugins {
+    kotlin("jvm")
+}
 
 dependencies {
     compile(projectDist(":kotlin-stdlib"))
diff --git a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
index 79978380e95..587e2af4df5 100644
--- a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
+++ b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
@@ -2,7 +2,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 description = "Kotlin Mock Runtime for Tests"
 
-apply { plugin("kotlin") }
+plugins {
+    kotlin("jvm")
+}
 
 jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String
diff --git a/libraries/tools/kotlin-annotation-processing/build.gradle.kts b/libraries/tools/kotlin-annotation-processing/build.gradle.kts
index cf4be64f3e1..e685adf38a7 100644
--- a/libraries/tools/kotlin-annotation-processing/build.gradle.kts
+++ b/libraries/tools/kotlin-annotation-processing/build.gradle.kts
@@ -4,7 +4,9 @@ import org.gradle.jvm.tasks.Jar
 
 description = "Annotation Processor wrapper for Kotlin"
 
-apply { plugin("kotlin") }
+plugins {
+    kotlin("jvm")
+}
 
 val packedJars by configurations.creating
 
diff --git a/libraries/tools/kotlin-annotations-android/build.gradle.kts b/libraries/tools/kotlin-annotations-android/build.gradle.kts
index 78a74e93654..f3bda56f4d6 100644
--- a/libraries/tools/kotlin-annotations-android/build.gradle.kts
+++ b/libraries/tools/kotlin-annotations-android/build.gradle.kts
@@ -2,7 +2,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 description = "Kotlin annotations for Android"
 
-apply { plugin("kotlin") }
+plugins {
+    kotlin("jvm")
+}
 
 jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String
diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts b/libraries/tools/kotlin-script-util/build.gradle.kts
index c3705743ba7..9137fc1f8ee 100644
--- a/libraries/tools/kotlin-script-util/build.gradle.kts
+++ b/libraries/tools/kotlin-script-util/build.gradle.kts
@@ -1,8 +1,10 @@
 
 description = "Kotlin scripting support utilities"
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(project(":kotlin-stdlib"))
diff --git a/plugins/allopen/allopen-cli/build.gradle.kts b/plugins/allopen/allopen-cli/build.gradle.kts
index 69ba5cc8ee7..29a4d5252e6 100644
--- a/plugins/allopen/allopen-cli/build.gradle.kts
+++ b/plugins/allopen/allopen-cli/build.gradle.kts
@@ -1,8 +1,10 @@
 
 description = "Kotlin AllOpen Compiler Plugin"
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     testRuntime(intellijDep())
diff --git a/plugins/allopen/allopen-ide/build.gradle.kts b/plugins/allopen/allopen-ide/build.gradle.kts
index af5b95b5c03..9b8e45daa92 100644
--- a/plugins/allopen/allopen-ide/build.gradle.kts
+++ b/plugins/allopen/allopen-ide/build.gradle.kts
@@ -1,8 +1,10 @@
 
 description = "Kotlin AllOpen IDEA Plugin"
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts
index df48a7747e2..d3f63de8f22 100644
--- a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts
+++ b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts
@@ -1,8 +1,10 @@
 
 description = "Kotlin Android Extensions Compiler"
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 val robolectricClasspath by configurations.creating
 
diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts
index d7f11433b11..5940ab385cf 100644
--- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts
+++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts
@@ -1,8 +1,10 @@
 
 description = "Kotlin Android Extensions IDEA"
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/plugins/android-extensions/android-extensions-jps/build.gradle.kts b/plugins/android-extensions/android-extensions-jps/build.gradle.kts
index 584b10429e2..94c97c1e0ee 100644
--- a/plugins/android-extensions/android-extensions-jps/build.gradle.kts
+++ b/plugins/android-extensions/android-extensions-jps/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     testRuntime(intellijDep())
diff --git a/plugins/android-extensions/android-extensions-runtime/build.gradle.kts b/plugins/android-extensions/android-extensions-runtime/build.gradle.kts
index d098782eaec..2b11d4a3ccb 100644
--- a/plugins/android-extensions/android-extensions-runtime/build.gradle.kts
+++ b/plugins/android-extensions/android-extensions-runtime/build.gradle.kts
@@ -1,7 +1,9 @@
 description = "Kotlin Android Extensions Runtime"
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/plugins/annotation-based-compiler-plugins-ide-support/build.gradle.kts b/plugins/annotation-based-compiler-plugins-ide-support/build.gradle.kts
index 7a1bfe84df0..5294fe4aa4a 100644
--- a/plugins/annotation-based-compiler-plugins-ide-support/build.gradle.kts
+++ b/plugins/annotation-based-compiler-plugins-ide-support/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts b/plugins/kapt3/kapt3-compiler/build.gradle.kts
index 6644782b3be..7ca6e48854b 100644
--- a/plugins/kapt3/kapt3-compiler/build.gradle.kts
+++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts
@@ -1,8 +1,10 @@
 
 description = "Annotation Processor for Kotlin"
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 containsEmbeddedComponents()
 
diff --git a/plugins/kapt3/kapt3-idea/build.gradle.kts b/plugins/kapt3/kapt3-idea/build.gradle.kts
index 76881922a8d..3c42a6338ed 100644
--- a/plugins/kapt3/kapt3-idea/build.gradle.kts
+++ b/plugins/kapt3/kapt3-idea/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/plugins/kapt3/kapt3-runtime/build.gradle.kts b/plugins/kapt3/kapt3-runtime/build.gradle.kts
index 6cd3ff6e98d..a233a93fd37 100644
--- a/plugins/kapt3/kapt3-runtime/build.gradle.kts
+++ b/plugins/kapt3/kapt3-runtime/build.gradle.kts
@@ -1,7 +1,9 @@
 description = "Kotlin Annotation Processing Runtime"
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(projectDist(":kotlin-stdlib"))
diff --git a/plugins/lint/build.gradle.kts b/plugins/lint/build.gradle.kts
index a4e43d1a49c..275bbeee820 100644
--- a/plugins/lint/build.gradle.kts
+++ b/plugins/lint/build.gradle.kts
@@ -1,8 +1,8 @@
 
-apply {
-    plugin("kotlin")
-    plugin("java")
-    plugin("jps-compatible")
+plugins {
+    java
+    kotlin("jvm")
+    id("jps-compatible")
 }
 
 dependencies {
diff --git a/plugins/noarg/noarg-cli/build.gradle.kts b/plugins/noarg/noarg-cli/build.gradle.kts
index 5929301f733..744a22f1288 100644
--- a/plugins/noarg/noarg-cli/build.gradle.kts
+++ b/plugins/noarg/noarg-cli/build.gradle.kts
@@ -1,8 +1,10 @@
 
 description = "Kotlin NoArg Compiler Plugin"
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     testRuntime(intellijDep())
diff --git a/plugins/noarg/noarg-ide/build.gradle.kts b/plugins/noarg/noarg-ide/build.gradle.kts
index 14b076019e2..d5689675748 100644
--- a/plugins/noarg/noarg-ide/build.gradle.kts
+++ b/plugins/noarg/noarg-ide/build.gradle.kts
@@ -1,8 +1,10 @@
 
 description = "Kotlin NoArg IDEA Plugin"
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/plugins/pill/generate-all-tests/build.gradle.kts b/plugins/pill/generate-all-tests/build.gradle.kts
index 2b520d04753..c27e8ec0eb5 100644
--- a/plugins/pill/generate-all-tests/build.gradle.kts
+++ b/plugins/pill/generate-all-tests/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 val depenencyProjects = arrayOf(
     ":generators", ":compiler", ":js:js.tests", ":compiler:tests-java8"
diff --git a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
index 59f6271d234..38dc9793d14 100644
--- a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
+++ b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
@@ -1,8 +1,10 @@
 
 description = "Kotlin SamWithReceiver Compiler Plugin"
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compileOnly(project(":compiler:frontend"))
diff --git a/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts
index 86390c90b21..0603f259ac8 100644
--- a/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts
+++ b/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts
@@ -1,8 +1,10 @@
 
 description = "Kotlin SamWithReceiver IDEA Plugin"
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 
diff --git a/plugins/source-sections/source-sections-compiler/build.gradle.kts b/plugins/source-sections/source-sections-compiler/build.gradle.kts
index 85ed4967ce3..174e4d4acd5 100644
--- a/plugins/source-sections/source-sections-compiler/build.gradle.kts
+++ b/plugins/source-sections/source-sections-compiler/build.gradle.kts
@@ -1,8 +1,10 @@
 
 description = "Kotlin SourceSections Compiler Plugin"
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 
 dependencies {
diff --git a/plugins/uast-kotlin-idea/build.gradle.kts b/plugins/uast-kotlin-idea/build.gradle.kts
index 85bec180384..36ba92475d7 100644
--- a/plugins/uast-kotlin-idea/build.gradle.kts
+++ b/plugins/uast-kotlin-idea/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(projectDist(":kotlin-stdlib"))
diff --git a/plugins/uast-kotlin/build.gradle.kts b/plugins/uast-kotlin/build.gradle.kts
index e47e6fbd209..56508510bee 100644
--- a/plugins/uast-kotlin/build.gradle.kts
+++ b/plugins/uast-kotlin/build.gradle.kts
@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
-apply { plugin("jps-compatible") }
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(projectDist(":kotlin-stdlib"))
diff --git a/prepare/android-extensions-compiler-gradle/build.gradle.kts b/prepare/android-extensions-compiler-gradle/build.gradle.kts
index e179fa83e69..e034679d559 100644
--- a/prepare/android-extensions-compiler-gradle/build.gradle.kts
+++ b/prepare/android-extensions-compiler-gradle/build.gradle.kts
@@ -3,7 +3,9 @@ import org.gradle.jvm.tasks.Jar
 
 description = "Kotlin Android Extensions Compiler"
 
-apply { plugin("kotlin") }
+plugins {
+    kotlin("jvm")
+}
 
 dependencies {
     compileOnly(project(":compiler:util"))
diff --git a/prepare/android-lint/build.gradle.kts b/prepare/android-lint/build.gradle.kts
index 1e2cdac74bf..a31f18b7ec9 100644
--- a/prepare/android-lint/build.gradle.kts
+++ b/prepare/android-lint/build.gradle.kts
@@ -1,7 +1,9 @@
 
 description = "Kotlin Android Lint"
 
-apply { plugin("java-base") }
+plugins {
+    `java-base`
+}
 
 val projectsToShadow = listOf(
         ":plugins:lint",
diff --git a/prepare/compiler-client-embeddable/build.gradle.kts b/prepare/compiler-client-embeddable/build.gradle.kts
index 722d59906c6..b1b56f0a5ea 100644
--- a/prepare/compiler-client-embeddable/build.gradle.kts
+++ b/prepare/compiler-client-embeddable/build.gradle.kts
@@ -4,10 +4,9 @@ description = "Kotlin compiler client embeddable"
 
 plugins {
     maven
+    kotlin("jvm")
 }
 
-apply { plugin("kotlin") }
-
 val jarContents by configurations.creating
 val testRuntimeCompilerJar by configurations.creating
 val testStdlibJar by configurations.creating
diff --git a/prepare/formatter/build.gradle.kts b/prepare/formatter/build.gradle.kts
index 4a0f8f7fcd5..8e2934f913d 100644
--- a/prepare/formatter/build.gradle.kts
+++ b/prepare/formatter/build.gradle.kts
@@ -1,7 +1,9 @@
 
 description = "Kotlin Formatter"
 
-apply { plugin("java") }
+plugins {
+    java
+}
 
 runtimeJar {
     archiveName = "kotlin-formatter.jar"
diff --git a/prepare/ide-lazy-resolver/build.gradle.kts b/prepare/ide-lazy-resolver/build.gradle.kts
index 8673612aa4a..d0d6e058f19 100644
--- a/prepare/ide-lazy-resolver/build.gradle.kts
+++ b/prepare/ide-lazy-resolver/build.gradle.kts
@@ -2,7 +2,9 @@ import java.util.Properties
 
 description = "Kotlin IDE Lazy Resolver"
 
-apply { plugin("java") }
+plugins {
+    java
+}
 
 val versions by configurations.creating
 val versionFilePath = "$rootDir/dependencies/dependencies.properties"
diff --git a/test-instrumenter/build.gradle.kts b/test-instrumenter/build.gradle.kts
index 70047c8871d..d692c822395 100644
--- a/test-instrumenter/build.gradle.kts
+++ b/test-instrumenter/build.gradle.kts
@@ -1,7 +1,9 @@
 import org.gradle.jvm.tasks.Jar
 
-plugins { java }
-apply { plugin("kotlin") }
+plugins {
+    java
+    kotlin("jvm")
+}
 
 dependencies {
     compile(project(":kotlin-stdlib"))
diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts
index 766d785e50a..157de847646 100644
--- a/ultimate/build.gradle.kts
+++ b/ultimate/build.gradle.kts
@@ -4,8 +4,8 @@ import org.gradle.jvm.tasks.Jar
 
 description = "Kotlin IDEA Ultimate plugin"
 
-apply {
-    plugin("kotlin")
+plugins {
+    kotlin("jvm")
 }
 
 val ideaProjectResources =  project(":idea").the<JavaPluginConvention>().sourceSets["main"].output.resourcesDir
diff --git a/ultimate/ultimate-runner/build.gradle.kts b/ultimate/ultimate-runner/build.gradle.kts
index 09f086794e3..7eb921f8f83 100644
--- a/ultimate/ultimate-runner/build.gradle.kts
+++ b/ultimate/ultimate-runner/build.gradle.kts
@@ -1,5 +1,7 @@
 
-apply { plugin("kotlin") }
+plugins {
+    kotlin("jvm")
+}
 
 dependencies {
     compileOnly(project(":idea"))