Add explicit dependencies to nullable annotations

2018-12-11 12:26:17 +03:00
parent 423653d225
commit 883970fadb
38 changed files with 41 additions and 11 deletions
@@ -12,6 +12,7 @@ dependencies {
    compile(project(":compiler:frontend"))
    compile(project(":compiler:backend"))
    compile(project(":kotlin-stdlib"))
+    compileOnly("org.jetbrains:annotations:13.0")
    compile(project(":kotlin-reflect"))
    compile(projectTests(":compiler:tests-common"))
    compile(commonDep("junit:junit"))
@@ -13,6 +13,7 @@ dependencies {
    compile(project(":compiler:frontend"))
    compile(project(":compiler:ir.tree"))
    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly("org.jetbrains:annotations:13.0")
 }

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

 dependencies {
    compile(project(":kotlin-stdlib"))
+    compileOnly("org.jetbrains:annotations:13.0")
 }

 sourceSets {
@@ -19,6 +19,7 @@ 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,8 +9,10 @@ dependencies {
    compile(project(":core:util.runtime"))
    compile(commonDep("javax.inject"))
    compileOnly(project(":kotlin-stdlib"))
+    compileOnly("org.jetbrains:annotations:13.0")
    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
    testCompile(project(":kotlin-stdlib"))
+    testCompileOnly("org.jetbrains:annotations:13.0")
    testCompile(project(":kotlin-test:kotlin-test-jvm"))
    testCompile(project(":kotlin-test:kotlin-test-junit"))
    testCompile(commonDep("junit:junit"))
@@ -14,6 +14,7 @@ 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,6 +12,7 @@ dependencies {
    compile(project(":compiler:util"))
    compile(project(":compiler:cli-common"))
    compile(project(":kotlin-stdlib"))
+    compileOnly("org.jetbrains:annotations:13.0")
    compileOnly(project(":js:js.frontend"))
    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
    compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
@@ -10,6 +10,7 @@ dependencies {
    compile(project(":compiler:util"))
    compile(project(":compiler:frontend"))
    compile(project(":kotlin-stdlib"))
+    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") }
@@ -22,6 +22,7 @@ dependencies {
    testCompile(commonDep("junit:junit"))
    testCompile(project(":kotlin-test:kotlin-test-junit"))
    testCompile(project(":kotlin-stdlib"))
+    testCompileOnly("org.jetbrains:annotations:13.0")
    testCompile(projectTests(":kotlin-build-common"))
    testCompile(projectTests(":compiler:tests-common"))
    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
@@ -10,6 +10,7 @@ dependencies {
    compile(project(":compiler:util"))
    compile(project(":compiler:frontend"))
    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly("org.jetbrains:annotations:13.0")
 }

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

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

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

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

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

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

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

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

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

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

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

 dependencies {
    compile(project(":kotlin-stdlib"))
+    compileOnly("org.jetbrains:annotations:13.0")
    compile(project(":core:deserialization"))
    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
    compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
@@ -13,6 +13,7 @@ dependencies {
    compile(project(":core:metadata.jvm"))
    compile(project(":core:util.runtime"))
    compile(commonDep("javax.inject"))
+    compileOnly("org.jetbrains:annotations:13.0")
 }

 sourceSets {
@@ -8,6 +8,7 @@ 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,6 +9,7 @@ javaHome = rootProject.extra["JDK_16"] as String
 dependencies {
    compile(project(":core:util.runtime"))
    compile(project(":kotlin-stdlib"))
+    compileOnly("org.jetbrains:annotations:13.0")
    compile(project(":kotlin-annotations-jvm"))
 }

@@ -11,6 +11,7 @@ dependencies {
    compile(project(":core:util.runtime"))
    compile(project(":core:descriptors"))
    compile(commonDep("javax.inject"))
+    compileOnly("org.jetbrains:annotations:13.0")
 }

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

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

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

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

 dependencies {
    compileOnly(project(":kotlin-stdlib"))
+    compileOnly("org.jetbrains:annotations:13.0")
 }

 sourceSets {
@@ -20,7 +20,7 @@ dependencies {

    compile(project(":idea:idea-core"))

-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
    compileOnly(intellijDep()) { includeJars("util", "openapi", "idea", "asm-all", "jdom", "annotations", "trove4j", "guava", rootProject = rootProject) }
    compileOnly(intellijPluginDep("gradle")) //{ includeJars("gradle-tooling-api", "gradle", rootProject = rootProject) }
 }
@@ -10,7 +10,7 @@ dependencies {
    compile(project(":compiler:frontend.java"))
    compile(project(":js:js.frontend"))
    compile(project(":js:js.serializer"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
    compileOnly(intellijDep())
 }

@@ -22,7 +22,7 @@ dependencies {
    compile(project(":kotlin-scripting-compiler"))
    compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
    compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")) { isTransitive = false }
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
    compileOnly(intellijDep()) {
        Ide.IJ191.orHigher {
            this@compileOnly.includeJars("platform-api")
@@ -9,7 +9,7 @@ jvmTarget = "1.6"
 dependencies {
    compile(project(":compiler:util"))
    compile(project(":compiler:frontend"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
    compileOnly(intellijDep()) { includeJars("trove4j") }
 }

@@ -8,7 +8,7 @@ dependencies {
    compile(project(":compiler:util"))
    compile(project(":js:js.ast"))
    compile(project(":js:js.translator"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
 }

 sourceSets {
@@ -12,7 +12,7 @@ dependencies {
    compile(project(":js:js.ast"))
    compile(project(":js:js.parser"))
    compile(project(":js:js.serializer"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
    compileOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }
 }

@@ -7,7 +7,7 @@ plugins {
 dependencies {
    compile(project(":compiler:util"))
    compile(project(":js:js.ast"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
 }

 sourceSets {
@@ -11,7 +11,7 @@ dependencies {
    compile(project(":compiler:frontend"))
    compile(project(":compiler:serialization"))
    compile(project(":js:js.ast"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
 }

 sourceSets {
@@ -23,7 +23,7 @@ dependencies {
    testCompileOnly(project(":compiler:frontend"))
    testCompileOnly(project(":compiler:cli"))
    testCompileOnly(project(":compiler:util"))
-    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
    testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util") }
    testCompile(project(":compiler:backend.js"))
    testCompile(project(":js:js.translator"))
@@ -16,7 +16,7 @@ dependencies {
    compile(project(":js:js.ast"))
    compile(project(":js:js.frontend"))
    compile(project(":js:js.parser"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") }
    compileOnly(intellijDep()) { includeJars("trove4j", "guava", rootProject = rootProject) }
 }

@@ -20,6 +20,7 @@ dependencies {
    compileOnly project(':core:deserialization')
    compileOnly project(':core:descriptors.runtime')
    compileOnly project(':core:util.runtime')
+    compileOnly "org.jetbrains:annotations:13.0"
 }

 compileJava9Sources(
@@ -62,7 +62,9 @@ dependencies {
    shadows(project(":core:descriptors.runtime"))
    shadows(project(":core:util.runtime"))
    shadows("javax.inject:javax.inject:1")
-    shadows(project(":custom-dependencies:protobuf-lite", configuration = "default"))
+    shadows(protobufLite())
+
+    compileOnly("org.jetbrains:annotations:13.0")
 }

 class KotlinModuleShadowTransformer(private val logger: Logger) : Transformer {