From 29797ec264a8dc0ebb30e0063a3707c2cbb82789 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Tue, 27 Mar 2018 09:26:40 +0200
Subject: [PATCH] Switch to plugins section in scripting build files after
 rebasing

---
 .../examples/scripting/jvm-maven-deps/host/build.gradle.kts   | 2 +-
 .../examples/scripting/jvm-maven-deps/script/build.gradle.kts | 2 +-
 .../scripting/jvm-simple-script/host/build.gradle.kts         | 2 +-
 .../scripting/jvm-simple-script/script/build.gradle.kts       | 2 +-
 libraries/scripting/common/build.gradle.kts                   | 2 +-
 libraries/scripting/jvm-host/build.gradle.kts                 | 4 ++--
 libraries/scripting/jvm/build.gradle.kts                      | 2 +-
 plugins/scripting/scripting-cli/build.gradle.kts              | 4 +++-
 plugins/scripting/scripting-gradle/build.gradle.kts           | 3 +--
 plugins/scripting/scripting-idea/build.gradle.kts             | 4 +++-
 10 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts b/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts
index 5db79930a46..dd30ca90a36 100644
--- a/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts
+++ b/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts
@@ -1 +1 @@
-import org.jetbrains.kotlin.gradle.dsl.Coroutines

apply {
    plugin("kotlin")
}

dependencies {
    compile(project(":examples:scripting-jvm-maven-deps:script"))
    compile(project(":kotlin-scripting-jvm-host"))
    compile(projectDist(":kotlin-stdlib"))
    compile(projectDist(":kotlin-reflect"))
    compileOnly(project(":compiler:util"))
    runtime(projectDist(":kotlin-compiler"))
    testCompile(commonDep("junit"))
}

sourceSets {
    "main" { projectDefault() }
    "test" { projectDefault() }
}

kotlin {
    experimental.coroutines = Coroutines.ENABLE
}
\ No newline at end of file
+import org.jetbrains.kotlin.gradle.dsl.Coroutines

plugins {
    kotlin("jvm")
}

dependencies {
    compile(project(":examples:scripting-jvm-maven-deps:script"))
    compile(project(":kotlin-scripting-jvm-host"))
    compile(projectDist(":kotlin-stdlib"))
    compile(projectDist(":kotlin-reflect"))
    compileOnly(project(":compiler:util"))
    runtime(projectDist(":kotlin-compiler"))
    testCompile(commonDep("junit"))
}

sourceSets {
    "main" { projectDefault() }
    "test" { projectDefault() }
}

kotlin {
    experimental.coroutines = Coroutines.ENABLE
}
\ No newline at end of file
diff --git a/libraries/examples/scripting/jvm-maven-deps/script/build.gradle.kts b/libraries/examples/scripting/jvm-maven-deps/script/build.gradle.kts
index d422f40f156..0a5677efbeb 100644
--- a/libraries/examples/scripting/jvm-maven-deps/script/build.gradle.kts
+++ b/libraries/examples/scripting/jvm-maven-deps/script/build.gradle.kts
@@ -1 +1 @@
-
apply {
    plugin("kotlin")
}

dependencies {
    compile(project(":kotlin-scripting-jvm"))
    compile(project(":kotlin-script-util"))
    runtime("com.jcabi:jcabi-aether:0.10.1")
    runtime("org.sonatype.aether:aether-api:1.13.1")
    runtime("org.apache.maven:maven-core:3.0.3")
}

sourceSets {
    "main" { projectDefault() }
    "test" { }
}

\ No newline at end of file
+
plugins {
    kotlin("jvm")
}

dependencies {
    compile(project(":kotlin-scripting-jvm"))
    compile(project(":kotlin-script-util"))
    runtime("com.jcabi:jcabi-aether:0.10.1")
    runtime("org.sonatype.aether:aether-api:1.13.1")
    runtime("org.apache.maven:maven-core:3.0.3")
}

sourceSets {
    "main" { projectDefault() }
    "test" { }
}

\ No newline at end of file
diff --git a/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts b/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts
index ad6c89b61de..04661df7fb9 100644
--- a/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts
+++ b/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts
@@ -1 +1 @@
-import org.jetbrains.kotlin.gradle.dsl.Coroutines

apply {
    plugin("kotlin")
}

dependencies {
    compile(project(":examples:scripting-jvm-simple-script:script"))
    compile(project(":kotlin-scripting-jvm-host"))
    compile(project(":kotlin-script-util"))
    runtime(projectDist(":kotlin-compiler"))
    testCompile(commonDep("junit"))
}

sourceSets {
    "main" { projectDefault() }
    "test" { projectDefault() }
}

kotlin {
    experimental.coroutines = Coroutines.ENABLE
}
\ No newline at end of file
+import org.jetbrains.kotlin.gradle.dsl.Coroutines

plugins {
    kotlin("jvm")
}

dependencies {
    compile(project(":examples:scripting-jvm-simple-script:script"))
    compile(project(":kotlin-scripting-jvm-host"))
    compile(project(":kotlin-script-util"))
    runtime(projectDist(":kotlin-compiler"))
    testCompile(commonDep("junit"))
}

sourceSets {
    "main" { projectDefault() }
    "test" { projectDefault() }
}

kotlin {
    experimental.coroutines = Coroutines.ENABLE
}
\ No newline at end of file
diff --git a/libraries/examples/scripting/jvm-simple-script/script/build.gradle.kts b/libraries/examples/scripting/jvm-simple-script/script/build.gradle.kts
index 808464cef13..d6ec62c1fd7 100644
--- a/libraries/examples/scripting/jvm-simple-script/script/build.gradle.kts
+++ b/libraries/examples/scripting/jvm-simple-script/script/build.gradle.kts
@@ -1 +1 @@
-
apply {
    plugin("kotlin")
}

dependencies {
    compile(project(":kotlin-scripting-jvm"))
}

sourceSets {
    "main" { projectDefault() }
    "test" {}
}
\ No newline at end of file
+
plugins {
    kotlin("jvm")
}

dependencies {
    compile(project(":kotlin-scripting-jvm"))
}

sourceSets {
    "main" { projectDefault() }
    "test" {}
}
\ No newline at end of file
diff --git a/libraries/scripting/common/build.gradle.kts b/libraries/scripting/common/build.gradle.kts
index e9b283b3d62..9a0d8c2f16f 100644
--- a/libraries/scripting/common/build.gradle.kts
+++ b/libraries/scripting/common/build.gradle.kts
@@ -1 +1 @@
-import org.jetbrains.kotlin.gradle.dsl.Coroutines

apply {
    plugin("kotlin")
}

jvmTarget = "1.6"

dependencies {
    compile(projectDist(":kotlin-stdlib"))
    compile(projectDist(":kotlin-reflect"))
    compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
}

sourceSets {
    "main" { projectDefault() }
    "test" {}
}

kotlin.experimental.coroutines = Coroutines.ENABLE

dist()

ideaPlugin()

standardPublicJars()

publish()
\ No newline at end of file
+import org.jetbrains.kotlin.gradle.dsl.Coroutines

plugins {
    kotlin("jvm")
}

jvmTarget = "1.6"

dependencies {
    compile(projectDist(":kotlin-stdlib"))
    compile(projectDist(":kotlin-reflect"))
    compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
}

sourceSets {
    "main" { projectDefault() }
    "test" {}
}

kotlin.experimental.coroutines = Coroutines.ENABLE

dist()

ideaPlugin()

standardPublicJars()

publish()
\ No newline at end of file
diff --git a/libraries/scripting/jvm-host/build.gradle.kts b/libraries/scripting/jvm-host/build.gradle.kts
index f7b38c47b8f..4bf4ca50796 100644
--- a/libraries/scripting/jvm-host/build.gradle.kts
+++ b/libraries/scripting/jvm-host/build.gradle.kts
@@ -1,8 +1,8 @@
 
 import org.jetbrains.kotlin.gradle.dsl.Coroutines
 
-apply {
-    plugin("kotlin")
+plugins {
+    kotlin("jvm")
 }
 
 jvmTarget = "1.6"
diff --git a/libraries/scripting/jvm/build.gradle.kts b/libraries/scripting/jvm/build.gradle.kts
index aa1e57bfb28..150568cfede 100644
--- a/libraries/scripting/jvm/build.gradle.kts
+++ b/libraries/scripting/jvm/build.gradle.kts
@@ -1 +1 @@
-import org.jetbrains.kotlin.gradle.dsl.Coroutines

apply {
    plugin("kotlin")
}

jvmTarget = "1.6"

dependencies {
    compile(project(":kotlin-script-runtime"))
    compile(projectDist(":kotlin-stdlib"))
    compile(project(":kotlin-scripting-common"))
}

sourceSets {
    "main" { projectDefault() }
    "test" {}
}

kotlin.experimental.coroutines = Coroutines.ENABLE

dist()

ideaPlugin()

standardPublicJars()

publish()
\ No newline at end of file
+import org.jetbrains.kotlin.gradle.dsl.Coroutines

plugins {
    kotlin("jvm")
}

jvmTarget = "1.6"

dependencies {
    compile(project(":kotlin-script-runtime"))
    compile(projectDist(":kotlin-stdlib"))
    compile(project(":kotlin-scripting-common"))
}

sourceSets {
    "main" { projectDefault() }
    "test" {}
}

kotlin.experimental.coroutines = Coroutines.ENABLE

dist()

ideaPlugin()

standardPublicJars()

publish()
\ No newline at end of file
diff --git a/plugins/scripting/scripting-cli/build.gradle.kts b/plugins/scripting/scripting-cli/build.gradle.kts
index df94187cdd1..3fdff6993d5 100644
--- a/plugins/scripting/scripting-cli/build.gradle.kts
+++ b/plugins/scripting/scripting-cli/build.gradle.kts
@@ -1,7 +1,9 @@
 
 description = "Kotlin Scripting Compiler Plugin"
 
-apply { plugin("kotlin") }
+plugins {
+    kotlin("jvm")
+}
 
 dependencies {
     compileOnly(project(":compiler:frontend"))
diff --git a/plugins/scripting/scripting-gradle/build.gradle.kts b/plugins/scripting/scripting-gradle/build.gradle.kts
index 7f00907efdc..be086182443 100644
--- a/plugins/scripting/scripting-gradle/build.gradle.kts
+++ b/plugins/scripting/scripting-gradle/build.gradle.kts
@@ -2,9 +2,8 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 description = "Kotlin Scripting Compiler Plugin for Gradle"
 
-apply { plugin("kotlin") }
-
 plugins {
+    kotlin("jvm")
     id("com.gradle.plugin-publish")
     `java-gradle-plugin`
 }
diff --git a/plugins/scripting/scripting-idea/build.gradle.kts b/plugins/scripting/scripting-idea/build.gradle.kts
index 3de83d9333b..2b5741b0142 100644
--- a/plugins/scripting/scripting-idea/build.gradle.kts
+++ b/plugins/scripting/scripting-idea/build.gradle.kts
@@ -1,7 +1,9 @@
 
 description = "Kotlin Scripting IDEA Plugin"
 
-apply { plugin("kotlin") }
+plugins {
+    kotlin("jvm")
+}
 
 dependencies {
     compile(project(":kotlin-scripting-compiler"))