From f4d5649cd5d53c3f3d7aafadf418b64827d3a76e Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Tue, 24 Apr 2018 15:21:47 +0300
Subject: [PATCH] Replace default-type dependencies to :kotlin-stdlib with
 distJar

Use distJar configuration instead.
It's necessary because currently when using default-type, subproject
starts having a transitive dependency to :kotlin-stdlib-common
and that leads to exception from KT-20897 when building light classes

This change might be reverted once KT-23942 is fixed

 #KT-23942 Submitted

Original commit: 003f381fcd7991d4d894aff8f35895ee31201cb7
---
 jps/jps-plugin/build.gradle.kts      | 1 +
 jps/jps-plugin/build.gradle.kts.181  | 1 +
 jps/jps-plugin/build.gradle.kts.as31 | 1 +
 jps/jps-plugin/build.gradle.kts.as32 | 1 +
 4 files changed, 4 insertions(+)

diff --git a/jps/jps-plugin/build.gradle.kts b/jps/jps-plugin/build.gradle.kts
index 2cc84804d61..01d8ffabb1d 100644
--- a/jps/jps-plugin/build.gradle.kts
+++ b/jps/jps-plugin/build.gradle.kts
@@ -15,6 +15,7 @@ dependencies {
     compile(project(":compiler:frontend.java"))
     compile(projectRuntimeJar(":kotlin-preloader"))
     compile(project(":idea:idea-jps-common"))
+    compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0")
     compileOnly(intellijDep()) { includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all") }
     compileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
     testCompileOnly(project(":kotlin-reflect-api"))
diff --git a/jps/jps-plugin/build.gradle.kts.181 b/jps/jps-plugin/build.gradle.kts.181
index c6c056a0759..c1b73d11bfc 100644
--- a/jps/jps-plugin/build.gradle.kts.181
+++ b/jps/jps-plugin/build.gradle.kts.181
@@ -15,6 +15,7 @@ dependencies {
     compile(project(":compiler:frontend.java"))
     compile(projectRuntimeJar(":kotlin-preloader"))
     compile(project(":idea:idea-jps-common"))
+    compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0")
     compileOnly(intellijDep()) { includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all") }
     compileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
     testCompileOnly(project(":kotlin-reflect-api"))
diff --git a/jps/jps-plugin/build.gradle.kts.as31 b/jps/jps-plugin/build.gradle.kts.as31
index 5da3a9e2fb7..90688be0dcf 100644
--- a/jps/jps-plugin/build.gradle.kts.as31
+++ b/jps/jps-plugin/build.gradle.kts.as31
@@ -15,6 +15,7 @@ dependencies {
     compile(project(":compiler:frontend.java"))
     compile(projectRuntimeJar(":kotlin-preloader"))
     compile(project(":idea:idea-jps-common"))
+    compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0")
     compileOnly(intellijDep()) { includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all") }
     compileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
     testCompileOnly(project(":kotlin-reflect-api"))
diff --git a/jps/jps-plugin/build.gradle.kts.as32 b/jps/jps-plugin/build.gradle.kts.as32
index 5da3a9e2fb7..90688be0dcf 100644
--- a/jps/jps-plugin/build.gradle.kts.as32
+++ b/jps/jps-plugin/build.gradle.kts.as32
@@ -15,6 +15,7 @@ dependencies {
     compile(project(":compiler:frontend.java"))
     compile(projectRuntimeJar(":kotlin-preloader"))
     compile(project(":idea:idea-jps-common"))
+    compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0")
     compileOnly(intellijDep()) { includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all") }
     compileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
     testCompileOnly(project(":kotlin-reflect-api"))