From f35185b261748c0099d0f6fcfebf5bd45eb8841a Mon Sep 17 00:00:00 2001
From: Sergey Rostov <Sergey.Rostov@jetbrains.com>
Date: Wed, 23 Jan 2019 14:50:03 +0300
Subject: [PATCH] Build: remove explicit dependencies to
 org.jetbrains.annotations

---
 compiler/android-tests/build.gradle.kts                | 1 -
 compiler/backend-common/build.gradle.kts               | 1 -
 compiler/cli/build.gradle.kts                          | 1 -
 compiler/cli/cli-runner/build.gradle.kts               | 1 -
 compiler/compiler-runner/build.gradle.kts              | 1 -
 compiler/container/build.gradle.kts                    | 1 -
 compiler/daemon/build.gradle.kts                       | 1 -
 compiler/daemon/daemon-common/build.gradle.kts         | 1 -
 compiler/frontend.script/build.gradle.kts              | 1 -
 compiler/incremental-compilation-impl/build.gradle.kts | 1 -
 compiler/plugin-api/build.gradle.kts                   | 1 -
 compiler/preloader/build.gradle.kts                    | 1 -
 compiler/resolution/build.gradle.kts                   | 1 -
 compiler/serialization/build.gradle.kts                | 1 -
 compiler/tests-common-jvm6/build.gradle.kts            | 1 -
 compiler/tests-different-jdk/build.gradle.kts          | 1 -
 compiler/tests-java8/build.gradle.kts                  | 1 -
 compiler/tests-spec/build.gradle.kts                   | 1 -
 compiler/util/build.gradle.kts                         | 1 -
 core/descriptors.jvm/build.gradle.kts                  | 1 -
 core/descriptors.runtime/build.gradle.kts              | 1 -
 core/descriptors/build.gradle.kts                      | 1 -
 core/deserialization/build.gradle.kts                  | 1 -
 core/metadata.jvm/build.gradle.kts                     | 1 -
 core/metadata/build.gradle.kts                         | 1 -
 core/util.runtime/build.gradle.kts                     | 1 -
 jps-plugin/build.gradle.kts                            | 1 -
 libraries/reflect/build.gradle.kts                     | 2 +-
 28 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/compiler/android-tests/build.gradle.kts b/compiler/android-tests/build.gradle.kts
index dc642cf1d6d..19508002d25 100644
--- a/compiler/android-tests/build.gradle.kts
+++ b/compiler/android-tests/build.gradle.kts
@@ -12,7 +12,6 @@ dependencies {
     compile(project(":compiler:frontend"))
     compile(project(":compiler:backend"))
     compile(kotlinStdlib())
-    compileOnly("org.jetbrains:annotations:13.0")
     compile(project(":kotlin-reflect"))
     compile(projectTests(":compiler:tests-common"))
     compile(commonDep("junit:junit"))
diff --git a/compiler/backend-common/build.gradle.kts b/compiler/backend-common/build.gradle.kts
index b98617c8646..87be07331d2 100644
--- a/compiler/backend-common/build.gradle.kts
+++ b/compiler/backend-common/build.gradle.kts
@@ -13,7 +13,6 @@ dependencies {
     compile(project(":compiler:frontend"))
     compile(project(":compiler:ir.tree"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/compiler/cli/build.gradle.kts b/compiler/cli/build.gradle.kts
index b8ce8b67f38..75b8d8c6320 100644
--- a/compiler/cli/build.gradle.kts
+++ b/compiler/cli/build.gradle.kts
@@ -25,7 +25,6 @@ dependencies {
     compile(files("${System.getProperty("java.home")}/../lib/tools.jar"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
-    compileOnly("org.jetbrains:annotations:13.0")
 
     testCompile(project(":compiler:backend"))
     testCompile(project(":compiler:cli"))
diff --git a/compiler/cli/cli-runner/build.gradle.kts b/compiler/cli/cli-runner/build.gradle.kts
index 02aa1e18949..fae949c2d89 100644
--- a/compiler/cli/cli-runner/build.gradle.kts
+++ b/compiler/cli/cli-runner/build.gradle.kts
@@ -10,7 +10,6 @@ jvmTarget = "1.6"
 
 dependencies {
     compile(kotlinStdlib())
-    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/compiler/compiler-runner/build.gradle.kts b/compiler/compiler-runner/build.gradle.kts
index da2984a9cbe..d01a85dd572 100644
--- a/compiler/compiler-runner/build.gradle.kts
+++ b/compiler/compiler-runner/build.gradle.kts
@@ -19,7 +19,6 @@ dependencies {
     compile(projectRuntimeJar(":kotlin-daemon-client"))
     compileOnly(project(":compiler:util"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly("org.jetbrains:annotations:13.0")
     runtimeOnly(projectRuntimeJar(":kotlin-compiler-embeddable"))
 }
 
diff --git a/compiler/container/build.gradle.kts b/compiler/container/build.gradle.kts
index e58ec1d33fc..6dbf767b5f7 100644
--- a/compiler/container/build.gradle.kts
+++ b/compiler/container/build.gradle.kts
@@ -9,7 +9,6 @@ dependencies {
     compile(project(":core:util.runtime"))
     compile(commonDep("javax.inject"))
     compileOnly(kotlinStdlib())
-    compileOnly("org.jetbrains:annotations:13.0")
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     testCompile(kotlinStdlib())
     testCompileOnly("org.jetbrains:annotations:13.0")
diff --git a/compiler/daemon/build.gradle.kts b/compiler/daemon/build.gradle.kts
index f1c2c1ba18a..73192de66f7 100644
--- a/compiler/daemon/build.gradle.kts
+++ b/compiler/daemon/build.gradle.kts
@@ -14,7 +14,6 @@ dependencies {
     compile(commonDep("org.fusesource.jansi", "jansi"))
     compile(commonDep("org.jline", "jline"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly("org.jetbrains:annotations:13.0")
     compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
 }
 
diff --git a/compiler/daemon/daemon-common/build.gradle.kts b/compiler/daemon/daemon-common/build.gradle.kts
index 6b60e9e1c94..22018b538ba 100644
--- a/compiler/daemon/daemon-common/build.gradle.kts
+++ b/compiler/daemon/daemon-common/build.gradle.kts
@@ -12,7 +12,6 @@ dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:cli-common"))
     compile(kotlinStdlib())
-    compileOnly("org.jetbrains:annotations:13.0")
     compileOnly(project(":js:js.frontend"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
diff --git a/compiler/frontend.script/build.gradle.kts b/compiler/frontend.script/build.gradle.kts
index 99f64b8b70b..3376a0a6910 100644
--- a/compiler/frontend.script/build.gradle.kts
+++ b/compiler/frontend.script/build.gradle.kts
@@ -10,7 +10,6 @@ dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
     compile(kotlinStdlib())
-    compileOnly("org.jetbrains:annotations:13.0")
     compileOnly(project(":kotlin-reflect-api"))
     compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
diff --git a/compiler/incremental-compilation-impl/build.gradle.kts b/compiler/incremental-compilation-impl/build.gradle.kts
index f70b4821686..fee3ea5db32 100644
--- a/compiler/incremental-compilation-impl/build.gradle.kts
+++ b/compiler/incremental-compilation-impl/build.gradle.kts
@@ -21,7 +21,6 @@ dependencies {
     testCompile(commonDep("junit:junit"))
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testCompile(kotlinStdlib())
-    testCompileOnly("org.jetbrains:annotations:13.0")
     testCompile(projectTests(":kotlin-build-common"))
     testCompile(projectTests(":compiler:tests-common"))
     testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
diff --git a/compiler/plugin-api/build.gradle.kts b/compiler/plugin-api/build.gradle.kts
index 8d464fe542e..c34e43582e0 100644
--- a/compiler/plugin-api/build.gradle.kts
+++ b/compiler/plugin-api/build.gradle.kts
@@ -10,7 +10,6 @@ dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/compiler/preloader/build.gradle.kts b/compiler/preloader/build.gradle.kts
index 2b29239ff65..d941e847a7e 100644
--- a/compiler/preloader/build.gradle.kts
+++ b/compiler/preloader/build.gradle.kts
@@ -10,7 +10,6 @@ jvmTarget = "1.6"
 
 dependencies {
     compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }
-    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/compiler/resolution/build.gradle.kts b/compiler/resolution/build.gradle.kts
index 683c135ccd5..b3f06407a07 100644
--- a/compiler/resolution/build.gradle.kts
+++ b/compiler/resolution/build.gradle.kts
@@ -10,7 +10,6 @@ dependencies {
     compile(project(":compiler:util"))
     compile(project(":core:descriptors"))
     compileOnly(intellijDep()) { includeJars("trove4j") }
-    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/compiler/serialization/build.gradle.kts b/compiler/serialization/build.gradle.kts
index bcce9d0f413..d49eb1f2f2c 100644
--- a/compiler/serialization/build.gradle.kts
+++ b/compiler/serialization/build.gradle.kts
@@ -11,7 +11,6 @@ dependencies {
     compile(project(":compiler:frontend"))
     compile(project(":core:descriptors"))
     compile(project(":core:deserialization"))
-    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/compiler/tests-common-jvm6/build.gradle.kts b/compiler/tests-common-jvm6/build.gradle.kts
index ac570df2087..4b89e017aff 100644
--- a/compiler/tests-common-jvm6/build.gradle.kts
+++ b/compiler/tests-common-jvm6/build.gradle.kts
@@ -8,7 +8,6 @@ jvmTarget = "1.6"
 
 dependencies {
     compile(kotlinStdlib())
-    compileOnly("org.jetbrains:annotations:13.0")
     testCompile(project(":kotlin-test:kotlin-test-jvm"))
 }
 
diff --git a/compiler/tests-different-jdk/build.gradle.kts b/compiler/tests-different-jdk/build.gradle.kts
index 5a045652956..e326954f9c1 100644
--- a/compiler/tests-different-jdk/build.gradle.kts
+++ b/compiler/tests-different-jdk/build.gradle.kts
@@ -15,7 +15,6 @@ dependencies {
     testRuntime(intellijDep())
     testRuntime(intellijDep())
     testJvm6ServerRuntime(projectTests(":compiler:tests-common-jvm6"))
-    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/compiler/tests-java8/build.gradle.kts b/compiler/tests-java8/build.gradle.kts
index c2cfeda4473..b3a1b610d1a 100644
--- a/compiler/tests-java8/build.gradle.kts
+++ b/compiler/tests-java8/build.gradle.kts
@@ -11,7 +11,6 @@ dependencies {
     testCompile(projectTests(":generators:test-generator"))
     testRuntime(project(":kotlin-reflect"))
     testRuntime(intellijDep())
-    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/compiler/tests-spec/build.gradle.kts b/compiler/tests-spec/build.gradle.kts
index 6a168d6bf57..707d1d6f8c9 100644
--- a/compiler/tests-spec/build.gradle.kts
+++ b/compiler/tests-spec/build.gradle.kts
@@ -5,7 +5,6 @@ plugins {
 
 dependencies {
     testCompile(projectTests(":compiler"))
-    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/compiler/util/build.gradle.kts b/compiler/util/build.gradle.kts
index 12b3372161d..c4f21326269 100644
--- a/compiler/util/build.gradle.kts
+++ b/compiler/util/build.gradle.kts
@@ -8,7 +8,6 @@ jvmTarget = "1.6"
 
 dependencies {
     compile(kotlinStdlib())
-    compileOnly("org.jetbrains:annotations:13.0")
     compile(project(":core:deserialization"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
diff --git a/core/descriptors.jvm/build.gradle.kts b/core/descriptors.jvm/build.gradle.kts
index ce7f3beb693..ae0a64b550b 100644
--- a/core/descriptors.jvm/build.gradle.kts
+++ b/core/descriptors.jvm/build.gradle.kts
@@ -13,7 +13,6 @@ dependencies {
     compile(project(":core:metadata.jvm"))
     compile(project(":core:util.runtime"))
     compile(commonDep("javax.inject"))
-    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/core/descriptors.runtime/build.gradle.kts b/core/descriptors.runtime/build.gradle.kts
index 5fbb27fd7b0..9ac94724366 100644
--- a/core/descriptors.runtime/build.gradle.kts
+++ b/core/descriptors.runtime/build.gradle.kts
@@ -8,7 +8,6 @@ dependencies {
     compileOnly(project(":core:util.runtime"))
     compileOnly(project(":core:descriptors"))
     compileOnly(project(":core:descriptors.jvm"))
-    compileOnly("org.jetbrains:annotations:13.0")
 
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(projectTests(":generators:test-generator"))
diff --git a/core/descriptors/build.gradle.kts b/core/descriptors/build.gradle.kts
index 7ef81656915..6a1dc2f0d39 100644
--- a/core/descriptors/build.gradle.kts
+++ b/core/descriptors/build.gradle.kts
@@ -9,7 +9,6 @@ javaHome = rootProject.extra["JDK_16"] as String
 dependencies {
     compile(project(":core:util.runtime"))
     compile(kotlinStdlib())
-    compileOnly("org.jetbrains:annotations:13.0")
     compile(project(":kotlin-annotations-jvm"))
 }
 
diff --git a/core/deserialization/build.gradle.kts b/core/deserialization/build.gradle.kts
index 54d98212bd1..e6c0e6dc127 100644
--- a/core/deserialization/build.gradle.kts
+++ b/core/deserialization/build.gradle.kts
@@ -11,7 +11,6 @@ dependencies {
     compile(project(":core:util.runtime"))
     compile(project(":core:descriptors"))
     compile(commonDep("javax.inject"))
-    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/core/metadata.jvm/build.gradle.kts b/core/metadata.jvm/build.gradle.kts
index 951f8317b97..20c824b80f0 100644
--- a/core/metadata.jvm/build.gradle.kts
+++ b/core/metadata.jvm/build.gradle.kts
@@ -8,7 +8,6 @@ javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
     compile(project(":core:metadata"))
-    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/core/metadata/build.gradle.kts b/core/metadata/build.gradle.kts
index 6909e619403..adc8d805c07 100644
--- a/core/metadata/build.gradle.kts
+++ b/core/metadata/build.gradle.kts
@@ -11,7 +11,6 @@ javaHome = rootProject.extra["JDK_16"] as String
 dependencies {
     compile(protobufLite())
     compile(kotlinStdlib())
-    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/core/util.runtime/build.gradle.kts b/core/util.runtime/build.gradle.kts
index 939a0b8e810..cf32b853d82 100644
--- a/core/util.runtime/build.gradle.kts
+++ b/core/util.runtime/build.gradle.kts
@@ -10,7 +10,6 @@ javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
     compileOnly(kotlinStdlib())
-    compileOnly("org.jetbrains:annotations:13.0")
 }
 
 sourceSets {
diff --git a/jps-plugin/build.gradle.kts b/jps-plugin/build.gradle.kts
index 8bda99c70d5..17f355345ed 100644
--- a/jps-plugin/build.gradle.kts
+++ b/jps-plugin/build.gradle.kts
@@ -16,7 +16,6 @@ dependencies {
     compile(project(":js:js.frontend"))
     compile(projectRuntimeJar(":kotlin-preloader"))
     compile(project(":idea:idea-jps-common"))
-    compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0")
     compileOnly(intellijDep()) {
         if (Platform[181].orHigher()) {
             includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all", rootProject = rootProject)
diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts
index 9c2ad047c14..8648c454fea 100644
--- a/libraries/reflect/build.gradle.kts
+++ b/libraries/reflect/build.gradle.kts
@@ -63,7 +63,7 @@ dependencies {
     shadows(project(":core:util.runtime"))
     shadows("javax.inject:javax.inject:1")
     shadows(protobufLite())
-
+    
     compileOnly("org.jetbrains:annotations:13.0")
 }