From 8a9c76588d816015a268341c153ded5636c1ac6d 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`).

Original commit: 8a82c1618cb6278e77c632b9a387e78b97fb931e
---
 jps/jps-common/build.gradle.kts | 6 ++++--
 jps/jps-plugin/build.gradle.kts | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/jps/jps-common/build.gradle.kts b/jps/jps-common/build.gradle.kts
index 43e3ac5ffd8..0503add5fff 100644
--- a/jps/jps-common/build.gradle.kts
+++ b/jps/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/jps/jps-plugin/build.gradle.kts b/jps/jps-plugin/build.gradle.kts
index a0147cf66bd..2cc84804d61 100644
--- a/jps/jps-plugin/build.gradle.kts
+++ b/jps/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