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

@@ -1,7 +1,9 @@
 
 description = "Kotlin Ant Tools"
 
-apply { plugin("kotlin") }
+plugins {
+    kotlin("jvm")
+}
 
 dependencies {
     compile(commonDep("org.apache.ant", "ant"))

build-common/build.gradle.kts

@@ -1,8 +1,10 @@
 
 description = "Kotlin Build Common"
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compileOnly(project(":core:util.runtime"))

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) }

compiler/android-tests/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

compiler/backend-common/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

compiler/backend/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

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") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

compiler/cli/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.8"
 

compiler/cli/cli-common/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

compiler/cli/cli-runner/build.gradle.kts

@@ -1,8 +1,10 @@
 
 description = "Kotlin Runner"
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

compiler/compiler-runner/build.gradle.kts

@@ -3,8 +3,10 @@ import org.gradle.jvm.tasks.Jar
 
 description = "Compiler runner + daemon client"
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

compiler/conditional-preprocessor/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

compiler/container/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

compiler/daemon/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

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") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

compiler/daemon/daemon-common/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

compiler/frontend.java/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

compiler/frontend.script/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

compiler/frontend/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

compiler/incremental-compilation-impl/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

compiler/ir/backend.js/build.gradle.kts

@@ -1,5 +1,7 @@
-plugins { kotlin("jvm") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

compiler/ir/ir.ir2cfg/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

compiler/ir/ir.psi2ir/build.gradle.kts

@@ -1,5 +1,7 @@
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

compiler/ir/ir.tree/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

compiler/light-classes/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

compiler/plugin-api/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

compiler/preloader/build.gradle.kts

@@ -1,8 +1,10 @@
 
 description = "Kotlin Preloader"
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

compiler/psi/build.gradle.kts

@@ -4,8 +4,10 @@
  */
 
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 
 jvmTarget = "1.6"

compiler/resolution/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

compiler/serialization/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

compiler/tests-common-jvm6/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

compiler/tests-common/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     testCompile(project(":core:descriptors"))

compiler/tests-ir-jvm/build.gradle.kts

@@ -1,5 +1,7 @@
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     testRuntime(intellijDep())

compiler/tests-java8/build.gradle.kts

@@ -1,7 +1,9 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     testCompile(projectTests(":compiler:tests-common"))

compiler/util/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

core/descriptors.jvm/build.gradle.kts

@@ -1,5 +1,7 @@
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String

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"))

core/descriptors/build.gradle.kts

@@ -1,5 +1,7 @@
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String

core/deserialization/build.gradle.kts

@@ -1,5 +1,7 @@
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String

core/metadata.jvm/build.gradle.kts

@@ -1,5 +1,7 @@
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String

core/metadata/build.gradle.kts

@@ -1,7 +1,9 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String

core/util.runtime/build.gradle.kts

@@ -1,8 +1,8 @@
 
-apply {
+plugins {
-    plugin("java")
+    java
-    plugin("kotlin")
+    kotlin("jvm")
-    plugin("jps-compatible")
+    id("jps-compatible")
 }
 
 jvmTarget = "1.6"

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

eval4j/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(projectDist(":kotlin-stdlib"))

generators/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(projectTests(":compiler:cli"))

generators/test-generator/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

idea-runner/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compileOnly(project(":idea"))

idea/build.gradle.kts

@@ -1,7 +1,9 @@
 import org.gradle.jvm.tasks.Jar
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     testRuntime(intellijDep())

idea/formatter/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(project(":compiler:util"))

idea/ide-common/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(project(":compiler:util"))

idea/idea-android/build.gradle.kts

@@ -1,8 +1,10 @@
 
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     testRuntime(intellijDep())

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"))

idea/idea-core/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(projectDist(":kotlin-stdlib"))

idea/idea-gradle/build.gradle.kts

@@ -1,5 +1,7 @@
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     testRuntime(intellijDep())

idea/idea-jps-common/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(projectDist(":kotlin-stdlib"))

idea/idea-jvm/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(project(":idea"))

idea/idea-maven/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(project(":core:util.runtime"))

idea/idea-test-framework/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     testCompile(project(":compiler:frontend"))

idea/kotlin-gradle-tooling/build.gradle.kts

@@ -1,8 +1,10 @@
 
 description = "Kotlin Gradle Tooling support"
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

j2k/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     testRuntime(intellijDep())

jps-plugin/build.gradle.kts

@@ -1,5 +1,7 @@
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 val compilerModules: Array<String> by rootProject.extra
 

js/js.ast/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

js/js.dce/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(project(":compiler:util"))

js/js.frontend/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

js/js.parser/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(project(":compiler:util"))

js/js.serializer/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

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 {

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 {

libraries/examples/annotation-processor-example/build.gradle.kts

@@ -1,8 +1,8 @@
 description = "Simple Annotation Processor for testing kapt"
 
-apply {
+plugins {
-    plugin("kotlin")
+    kotlin("jvm")
-    plugin("maven") // only used for installing to mavenLocal()
+    maven // only used for installing to mavenLocal()
 }
 
 dependencies {

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
 

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"))

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

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
 

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

libraries/tools/kotlin-script-util/build.gradle.kts

@@ -1,8 +1,10 @@
 
 description = "Kotlin scripting support utilities"
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(project(":kotlin-stdlib"))

plugins/allopen/allopen-cli/build.gradle.kts

@@ -1,8 +1,10 @@
 
 description = "Kotlin AllOpen Compiler Plugin"
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     testRuntime(intellijDep())

plugins/allopen/allopen-ide/build.gradle.kts

@@ -1,8 +1,10 @@
 
 description = "Kotlin AllOpen IDEA Plugin"
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

plugins/android-extensions/android-extensions-compiler/build.gradle.kts

@@ -1,8 +1,10 @@
 
 description = "Kotlin Android Extensions Compiler"
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 val robolectricClasspath by configurations.creating
 

plugins/android-extensions/android-extensions-idea/build.gradle.kts

@@ -1,8 +1,10 @@
 
 description = "Kotlin Android Extensions IDEA"
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

plugins/android-extensions/android-extensions-jps/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     testRuntime(intellijDep())

plugins/android-extensions/android-extensions-runtime/build.gradle.kts

@@ -1,7 +1,9 @@
 description = "Kotlin Android Extensions Runtime"
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

plugins/annotation-based-compiler-plugins-ide-support/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

plugins/kapt3/kapt3-compiler/build.gradle.kts

@@ -1,8 +1,10 @@
 
 description = "Annotation Processor for Kotlin"
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 containsEmbeddedComponents()
 

plugins/kapt3/kapt3-idea/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

plugins/kapt3/kapt3-runtime/build.gradle.kts

@@ -1,7 +1,9 @@
 description = "Kotlin Annotation Processing Runtime"
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(projectDist(":kotlin-stdlib"))

plugins/lint/build.gradle.kts

@@ -1,8 +1,8 @@
 
-apply {
+plugins {
-    plugin("kotlin")
+    java
-    plugin("java")
+    kotlin("jvm")
-    plugin("jps-compatible")
+    id("jps-compatible")
 }
 
 dependencies {

plugins/noarg/noarg-cli/build.gradle.kts

@@ -1,8 +1,10 @@
 
 description = "Kotlin NoArg Compiler Plugin"
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     testRuntime(intellijDep())

plugins/noarg/noarg-ide/build.gradle.kts

@@ -1,8 +1,10 @@
 
 description = "Kotlin NoArg IDEA Plugin"
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

plugins/pill/generate-all-tests/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 val depenencyProjects = arrayOf(
     ":generators", ":compiler", ":js:js.tests", ":compiler:tests-java8"

plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts

@@ -1,8 +1,10 @@
 
 description = "Kotlin SamWithReceiver Compiler Plugin"
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compileOnly(project(":compiler:frontend"))

plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts

@@ -1,8 +1,10 @@
 
 description = "Kotlin SamWithReceiver IDEA Plugin"
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 jvmTarget = "1.6"
 

plugins/source-sections/source-sections-compiler/build.gradle.kts

@@ -1,8 +1,10 @@
 
 description = "Kotlin SourceSections Compiler Plugin"
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 
 dependencies {

plugins/uast-kotlin-idea/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(projectDist(":kotlin-stdlib"))

plugins/uast-kotlin/build.gradle.kts

@@ -1,6 +1,8 @@
 
-apply { plugin("kotlin") }
+plugins {
-apply { plugin("jps-compatible") }
+    kotlin("jvm")
+    id("jps-compatible")
+}
 
 dependencies {
     compile(projectDist(":kotlin-stdlib"))

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"))

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",

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

prepare/formatter/build.gradle.kts

@@ -1,7 +1,9 @@
 
 description = "Kotlin Formatter"
 
-apply { plugin("java") }
+plugins {
+    java
+}
 
 runtimeJar {
     archiveName = "kotlin-formatter.jar"

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"

test-instrumenter/build.gradle.kts

@@ -1,7 +1,9 @@
 import org.gradle.jvm.tasks.Jar
 
-plugins { java }
+plugins {
-apply { plugin("kotlin") }
+    java
+    kotlin("jvm")
+}
 
 dependencies {
     compile(project(":kotlin-stdlib"))