From c439b6d38b628805fd4764a7d012031d6bf36d58 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Mon, 23 Apr 2018 22:31:40 +0300
Subject: [PATCH] Pill: Import common modules as libraries

---
 libraries/kotlin.test/annotations-common/build.gradle | 5 +++++
 libraries/kotlin.test/common/build.gradle             | 5 +++++
 libraries/stdlib/common/build.gradle                  | 5 +++++
 plugins/scripting/scripting-idea/build.gradle.kts     | 1 +
 4 files changed, 16 insertions(+)

diff --git a/libraries/kotlin.test/annotations-common/build.gradle b/libraries/kotlin.test/annotations-common/build.gradle
index b89e309b4ac..5988043c1b7 100644
--- a/libraries/kotlin.test/annotations-common/build.gradle
+++ b/libraries/kotlin.test/annotations-common/build.gradle
@@ -1,6 +1,7 @@
 description = 'Kotlin Test Annotations Common'
 
 apply plugin: 'kotlin-platform-common'
+apply plugin: 'pill-configurable'
 
 configureDist(project)
 configurePublishing(project)
@@ -10,6 +11,10 @@ dependencies {
     compile project(':kotlin-stdlib-common')
 }
 
+pill {
+    importAsLibrary = true
+}
+
 jar {
     manifestAttributes(manifest, project, 'Test')
 }
diff --git a/libraries/kotlin.test/common/build.gradle b/libraries/kotlin.test/common/build.gradle
index a8f968bf037..24aba8f6ccf 100644
--- a/libraries/kotlin.test/common/build.gradle
+++ b/libraries/kotlin.test/common/build.gradle
@@ -1,6 +1,7 @@
 description = 'Kotlin Test Common'
 
 apply plugin: 'kotlin-platform-common'
+apply plugin: 'pill-configurable'
 
 configureDist(project)
 configurePublishing(project)
@@ -11,6 +12,10 @@ dependencies {
     testCompile project(":kotlin-test:kotlin-test-annotations-common")
 }
 
+pill {
+    importAsLibrary = true
+}
+
 jar {
     manifestAttributes(manifest, project, 'Test')
 }
diff --git a/libraries/stdlib/common/build.gradle b/libraries/stdlib/common/build.gradle
index a0c9a29c59f..3cf3e05f174 100644
--- a/libraries/stdlib/common/build.gradle
+++ b/libraries/stdlib/common/build.gradle
@@ -1,6 +1,7 @@
 description = 'Kotlin Common Standard Library'
 
 apply plugin: 'kotlin-platform-common'
+apply plugin: 'pill-configurable'
 
 configureDist(project)
 configurePublishing(project)
@@ -8,6 +9,10 @@ configurePublishing(project)
 def commonSrcDir = "../src"
 def commonTestSrcDir = "../test"
 
+pill {
+    importAsLibrary = true
+}
+
 sourceSets {
     main {
         kotlin {
diff --git a/plugins/scripting/scripting-idea/build.gradle.kts b/plugins/scripting/scripting-idea/build.gradle.kts
index 2b5741b0142..7eb1a1b6c76 100644
--- a/plugins/scripting/scripting-idea/build.gradle.kts
+++ b/plugins/scripting/scripting-idea/build.gradle.kts
@@ -3,6 +3,7 @@ description = "Kotlin Scripting IDEA Plugin"
 
 plugins {
     kotlin("jvm")
+    id("jps-compatible")
 }
 
 dependencies {