Build: remove explicit dependencies to org.jetbrains.annotations

2019-01-23 14:50:03 +03:00
parent 78630fec41
commit f35185b261
28 changed files with 1 additions and 28 deletions
@@ -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"))
@@ -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 {
@@ -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"))
@@ -10,7 +10,6 @@ jvmTarget = "1.6"

 dependencies {
    compile(kotlinStdlib())
-    compileOnly("org.jetbrains:annotations:13.0")
 }

 sourceSets {
@@ -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"))
 }

@@ -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")
@@ -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) }
 }

@@ -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) }
@@ -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") }
@@ -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") }
@@ -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 {
@@ -10,7 +10,6 @@ jvmTarget = "1.6"

 dependencies {
    compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }
-    compileOnly("org.jetbrains:annotations:13.0")
 }

 sourceSets {
@@ -10,7 +10,6 @@ dependencies {
    compile(project(":compiler:util"))
    compile(project(":core:descriptors"))
    compileOnly(intellijDep()) { includeJars("trove4j") }
-    compileOnly("org.jetbrains:annotations:13.0")
 }

 sourceSets {
@@ -11,7 +11,6 @@ dependencies {
    compile(project(":compiler:frontend"))
    compile(project(":core:descriptors"))
    compile(project(":core:deserialization"))
-    compileOnly("org.jetbrains:annotations:13.0")
 }

 sourceSets {
@@ -8,7 +8,6 @@ jvmTarget = "1.6"

 dependencies {
    compile(kotlinStdlib())
-    compileOnly("org.jetbrains:annotations:13.0")
    testCompile(project(":kotlin-test:kotlin-test-jvm"))
 }

@@ -15,7 +15,6 @@ dependencies {
    testRuntime(intellijDep())
    testRuntime(intellijDep())
    testJvm6ServerRuntime(projectTests(":compiler:tests-common-jvm6"))
-    compileOnly("org.jetbrains:annotations:13.0")
 }

 sourceSets {
@@ -11,7 +11,6 @@ dependencies {
    testCompile(projectTests(":generators:test-generator"))
    testRuntime(project(":kotlin-reflect"))
    testRuntime(intellijDep())
-    compileOnly("org.jetbrains:annotations:13.0")
 }

 sourceSets {
@@ -5,7 +5,6 @@ plugins {

 dependencies {
    testCompile(projectTests(":compiler"))
-    compileOnly("org.jetbrains:annotations:13.0")
 }

 sourceSets {
@@ -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) }
@@ -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 {
@@ -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"))
@@ -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"))
 }

@@ -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 {
@@ -8,7 +8,6 @@ javaHome = rootProject.extra["JDK_16"] as String

 dependencies {
    compile(project(":core:metadata"))
-    compileOnly("org.jetbrains:annotations:13.0")
 }

 sourceSets {
@@ -11,7 +11,6 @@ javaHome = rootProject.extra["JDK_16"] as String
 dependencies {
    compile(protobufLite())
    compile(kotlinStdlib())
-    compileOnly("org.jetbrains:annotations:13.0")
 }

 sourceSets {
@@ -10,7 +10,6 @@ javaHome = rootProject.extra["JDK_16"] as String

 dependencies {
    compileOnly(kotlinStdlib())
-    compileOnly("org.jetbrains:annotations:13.0")
 }

 sourceSets {
@@ -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)
@@ -63,7 +63,7 @@ dependencies {
    shadows(project(":core:util.runtime"))
    shadows("javax.inject:javax.inject:1")
    shadows(protobufLite())
-
+    
    compileOnly("org.jetbrains:annotations:13.0")
 }