Build: Use intellij maven repo instead of downloaded IDEA

#KTI-82
This commit is contained in:
Vyacheslav Gerasimov
2021-11-24 03:41:51 +03:00
committed by teamcity
parent 9f725da7f7
commit f7a9065b75
160 changed files with 807 additions and 562 deletions
+2 -2
View File
@@ -9,7 +9,7 @@ plugins {
dependencies {
compileOnly(project(":compiler:plugin-api"))
compileOnly(project(":compiler:frontend"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijCore())
runtimeOnly(kotlinStdlib())
@@ -18,7 +18,7 @@ dependencies {
testApi(projectTests(":compiler:tests-common"))
testApi(commonDependency("junit:junit"))
testApi(intellijCoreDep()) { includeJars("intellij-core") }
testApi(intellijCore())
}
sourceSets {
@@ -10,7 +10,7 @@ val robolectricClasspath by configurations.creating
val androidExtensionsRuntimeForTests by configurations.creating
dependencies {
testApi(intellijCoreDep()) { includeJars("intellij-core") }
testApi(intellijCore())
compileOnly(project(":compiler:util"))
compileOnly(project(":compiler:plugin-api"))
@@ -21,8 +21,8 @@ dependencies {
compileOnly(project(":compiler:backend.jvm"))
compileOnly(project(":compiler:ir.tree.impl"))
compileOnly(project(":kotlin-android-extensions-runtime"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }
compileOnly(intellijCore())
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
testApi(project(":compiler:util"))
testApi(project(":compiler:backend"))
@@ -34,9 +34,6 @@ dependencies {
testApi(project(":kotlin-test:kotlin-test-jvm"))
testApi(commonDependency("junit:junit"))
testRuntimeOnly(intellijPluginDep("junit"))
testRuntimeOnly(intellijDep())
robolectricClasspath(commonDependency("org.robolectric", "robolectric"))
robolectricClasspath("org.robolectric:android-all:4.4_r1-robolectric-1")
robolectricClasspath(project(":kotlin-android-extensions-runtime")) { isTransitive = false }
@@ -44,7 +44,8 @@ repositories {
}
dependencies {
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }
compileOnly(intellijCore())
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
compileOnly(project(":compiler:plugin-api"))
compileOnly(project(":compiler:cli-common"))
@@ -15,7 +15,7 @@ dependencies {
compileOnly(project(":compiler:ir.tree.impl"))
compileOnly(project(":compiler:fir:entrypoint"))
compileOnly(project(":compiler:plugin-api"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijCore())
compileOnly(project(":kotlin-reflect-api"))
testApiJUnit5()
@@ -30,14 +30,10 @@ dependencies {
testRuntimeOnly(project(":core:descriptors.runtime"))
testRuntimeOnly(project(":compiler:fir:fir-serialization"))
testRuntimeOnly(intellijDep()) {
includeJars(
"jna",
"jdom",
"trove4j",
"intellij-deps-fastutil-8.4.1-4",
rootProject = rootProject)
}
testRuntimeOnly(commonDependency("net.java.dev.jna:jna"))
testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps:jdom"))
testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil"))
testRuntimeOnly(toolsJar())
}
@@ -10,22 +10,18 @@ dependencies {
testApi(project(":compiler:incremental-compilation-impl"))
testApi(projectTests(":compiler:incremental-compilation-impl"))
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testCompileOnly(intellijCore())
testCompileOnly(project(":kotlin-reflect-api"))
testRuntimeOnly(project(":kotlin-reflect"))
testRuntimeOnly(project(":core:descriptors.runtime"))
testRuntimeOnly(project(":compiler:fir:fir-serialization"))
testRuntimeOnly(intellijDep()) {
includeJars(
"lz4-java",
"jna",
"jdom",
"trove4j",
"intellij-deps-fastutil-8.4.1-4",
rootProject = rootProject)
}
testRuntimeOnly(commonDependency("org.lz4:lz4-java"))
testRuntimeOnly(commonDependency("net.java.dev.jna:jna"))
testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps:jdom"))
testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil"))
testRuntimeOnly(toolsJar())
}
+1 -1
View File
@@ -13,7 +13,7 @@ dependencies {
api(project(":compiler:plugin-api"))
compileOnly("org.jetbrains.kotlinx", "kotlinx-serialization-runtime", kotlinxSerializationVersion) { isTransitive = false }
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijCore())
testApi(projectTests(":compiler:tests-common"))
+6 -7
View File
@@ -19,8 +19,10 @@ configurations.getByName("compileOnly").extendsFrom(shadows)
configurations.getByName("testApi").extendsFrom(shadows)
dependencies {
// Should come before compiler dependencies, see comment in "compiler/build.gradle.kts"
testRuntimeOnly(intellijDep())
// Should come before dependency on proguarded compiler because StringUtil methods are deleted from it
testRuntimeOnly(intellijPlatformUtil()) { isTransitive = false }
testRuntimeOnly(project(":kotlin-compiler"))
compileOnly(project(":compiler:util"))
compileOnly(project(":compiler:cli"))
@@ -36,11 +38,8 @@ dependencies {
compileOnly(project(":kotlinx-metadata"))
shadows(commonDependency("org.jetbrains.kotlinx:kotlinx-metadata-jvm"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }
testApi(intellijDep()) { includeJars("platform-impl", rootProject = rootProject) }
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
testRuntimeOnly(project(":kotlin-compiler"))
compileOnly(intellijCore())
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
testImplementation(commonDependency("junit:junit"))
testImplementation(projectTests(":compiler:tests-common"))
+1 -1
View File
@@ -6,7 +6,7 @@ plugins {
dependencies {
api(project(":compiler:cli"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
compileOnly(intellijCore())
testApi(projectTests(":compiler:tests-common"))
testApi(projectTests(":compiler"))
@@ -7,13 +7,6 @@ plugins {
}
dependencies {
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testImplementation(intellijDep())
testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt") }
testCompileOnly(intellijDep()) { includeJars("platform-api", "platform-impl") }
testImplementation(intellijPluginDep("java"))
api(project(":compiler:util"))
api(project(":compiler:cli"))
api(project(":compiler:backend"))
@@ -25,8 +18,10 @@ dependencies {
compileOnly(project(":kotlin-annotation-processing-cli"))
compileOnly(project(":kotlin-annotation-processing-base"))
compileOnly(project(":kotlin-annotation-processing-runtime"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }
compileOnly(intellijCore())
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
testImplementation(intellijCore())
testApi(projectTests(":compiler:tests-common"))
testApi(project(":kotlin-annotation-processing-base"))
@@ -6,7 +6,8 @@ plugins {
}
dependencies {
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }
compileOnly(intellijCore())
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
compileOnly(project(":compiler:plugin-api"))
compileOnly(project(":compiler:cli-common"))
@@ -31,8 +32,7 @@ dependencies {
testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.2.2")
testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.2")
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") }
testRuntimeOnly(intellijCore())
}
sourceSets {
@@ -12,10 +12,10 @@ dependencies {
implementation(project(":compiler:frontend"))
implementation(project(":compiler:frontend.java"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijCore())
testImplementation(intellijCoreDep()) { includeJars("intellij-core") }
testImplementation(intellijCore())
testImplementation(commonDependency("junit:junit"))
testImplementation(projectTests(":compiler:tests-common"))
+3 -3
View File
@@ -13,15 +13,15 @@ dependencies {
compileOnly(project(":compiler:util"))
compileOnly(project(":compiler:plugin-api"))
compileOnly(project(":compiler:ir.backend.common"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }
compileOnly(intellijCore())
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
implementation(kotlinStdlib())
testApi(project(":compiler:backend"))
testApi(project(":compiler:cli"))
testApi(projectTests(":compiler:tests-common"))
testApi(commonDependency("junit:junit"))
testApi(intellijCoreDep()) { includeJars("intellij-core")}
testApi(intellijCore())
}
sourceSets {
@@ -13,7 +13,7 @@ val layoutLib by configurations.creating
val layoutLibApi by configurations.creating
dependencies {
testApi(intellijCoreDep()) { includeJars("intellij-core") }
testApi(intellijCore())
compileOnly(project(":compiler:util"))
compileOnly(project(":compiler:plugin-api"))
@@ -23,8 +23,8 @@ dependencies {
compileOnly(project(":compiler:ir.backend.common"))
compileOnly(project(":compiler:backend.jvm"))
compileOnly(project(":compiler:ir.tree.impl"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }
compileOnly(intellijCore())
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
// FIR dependencies
compileOnly(project(":compiler:fir:cones"))
@@ -64,8 +64,6 @@ dependencies {
testApi(commonDependency("junit:junit"))
testRuntimeOnly(intellijPluginDep("junit"))
robolectricClasspath(commonDependency("org.robolectric", "robolectric"))
robolectricClasspath("org.robolectric:android-all:4.4_r1-robolectric-1")
robolectricClasspath(project(":plugins:parcelize:parcelize-runtime")) { isTransitive = false }
@@ -10,17 +10,16 @@ dependencies {
compileOnly(project(":compiler:frontend"))
compileOnly(project(":compiler:frontend.java"))
compileOnly(project(":compiler:plugin-api"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijCore())
testApi(project(":compiler:backend"))
testApi(project(":compiler:cli"))
testApi(projectTests(":compiler:tests-common"))
testApi(commonDependency("junit:junit"))
testCompileOnly(project(":kotlin-compiler"))
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testCompileOnly(intellijCore())
testApi(project(":kotlin-scripting-jvm-host-unshaded"))
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") }
testRuntimeOnly(intellijCore())
}
sourceSets {
@@ -17,11 +17,11 @@ dependencies {
api(project(":kotlin-scripting-jvm"))
api(kotlinStdlib())
compileOnly(project(":kotlin-reflect-api"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }
compileOnly(intellijCore())
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
// FIXME: drop after removing references to LocalFileSystem they don't exist in intellij-core
compileOnly(intellijDep()) { includeJars("platform-api") }
compileOnly(intellijAnalysis())
runtimeOnly(project(":kotlin-reflect"))
@@ -22,7 +22,7 @@ dependencies {
api(project(":kotlin-scripting-jvm"))
api(project(":kotlin-scripting-compiler-impl"))
api(kotlinStdlib())
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijCore())
testApi(project(":compiler:frontend"))
testApi(project(":compiler:plugin-api"))
@@ -34,9 +34,8 @@ dependencies {
testApi(projectTests(":compiler:tests-common"))
testApi(commonDependency("junit:junit"))
testImplementation(intellijCoreDep()) { includeJars("intellij-core") }
testImplementation(intellijCore())
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
testRuntimeOnly(intellijDep()) { includeJars("jps-model", "jna") }
testImplementation(project(":kotlin-reflect"))
}
@@ -11,7 +11,7 @@ dependencies {
compileOnly(project(":compiler:frontend.java"))
compileOnly(project(":js:js.frontend"))
compileOnly(project(":js:js.serializer"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
compileOnly(intellijCore())
}
@@ -19,7 +19,7 @@ dependencies {
compileOnly(project(":kotlin-scripting-compiler"))
compileOnly(project(":compiler:cli"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijCore())
publishedRuntime(project(":kotlin-compiler"))
publishedRuntime(project(":kotlin-scripting-compiler"))
publishedRuntime(project(":kotlin-reflect"))