Build: Use intellij maven repo instead of downloaded IDEA
#KTI-82
This commit is contained in:
committed by
teamcity
parent
9f725da7f7
commit
f7a9065b75
@@ -15,10 +15,11 @@ dependencies {
|
||||
implementation(project(":kotlin-reflect-api"))
|
||||
|
||||
/*
|
||||
We do not need guava in the generator, but because of a bug in the IJ project importing, we need to have a dependency on intellijCoreDep
|
||||
We do not need guava in the generator, but because of a bug in the IJ project importing, we need to have a dependency on intellijCore
|
||||
the same as it is in `:fir:tree:tree-generator` module to the project be imported correctly
|
||||
*/
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
|
||||
compileOnly(intellijCore())
|
||||
compileOnly(commonDependency("com.google.guava:guava"))
|
||||
|
||||
implementation(project(":compiler:psi"))
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ dependencies {
|
||||
api(project(":analysis:analysis-api"))
|
||||
api(project(":analysis:analysis-api-impl-base"))
|
||||
api(project(":compiler:light-classes"))
|
||||
api(intellijCoreDep())
|
||||
api(intellijCore())
|
||||
implementation(project(":analysis:analysis-api-providers"))
|
||||
implementation(project(":analysis:analysis-internal-utils"))
|
||||
|
||||
@@ -33,26 +33,6 @@ dependencies {
|
||||
testApi(toolsJar())
|
||||
testApiJUnit5()
|
||||
testApi(project(":analysis:symbol-light-classes"))
|
||||
|
||||
testRuntimeOnly(intellijDep()) {
|
||||
includeJars(
|
||||
"jps-model",
|
||||
"extensions",
|
||||
"util",
|
||||
"platform-api",
|
||||
"platform-impl",
|
||||
"idea",
|
||||
"guava",
|
||||
"trove4j",
|
||||
"asm-all",
|
||||
"log4j",
|
||||
"jdom",
|
||||
"streamex",
|
||||
"bootstrap",
|
||||
"jna",
|
||||
rootProject = rootProject
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -7,7 +7,7 @@ dependencies {
|
||||
api(project(":compiler:psi"))
|
||||
api(project(":analysis:analysis-api-providers"))
|
||||
api(project(":analysis:project-structure"))
|
||||
api(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
|
||||
api(intellijCore())
|
||||
|
||||
testApiJUnit5()
|
||||
testApi(project(":kotlin-test:kotlin-test-junit"))
|
||||
|
||||
@@ -7,7 +7,7 @@ dependencies {
|
||||
api(project(":compiler:psi"))
|
||||
api(project(":analysis:analysis-api"))
|
||||
api(project(":analysis:analysis-api-impl-barebone"))
|
||||
api(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
|
||||
api(intellijCore())
|
||||
implementation(project(":analysis:analysis-internal-utils"))
|
||||
|
||||
testApiJUnit5()
|
||||
|
||||
@@ -8,7 +8,7 @@ dependencies {
|
||||
implementation(project(":compiler:frontend.java"))
|
||||
implementation(project(":core:compiler.common"))
|
||||
implementation(project(":analysis:project-structure"))
|
||||
implementation(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
|
||||
implementation(intellijCore())
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -18,7 +18,8 @@ dependencies {
|
||||
implementation(project(":analysis:analysis-internal-utils"))
|
||||
implementation(project(":analysis:analysis-api-providers"))
|
||||
|
||||
api(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
|
||||
api(intellijCore())
|
||||
api(commonDependency("com.google.guava:guava"))
|
||||
}
|
||||
|
||||
kotlin {
|
||||
|
||||
@@ -5,7 +5,7 @@ plugins {
|
||||
|
||||
dependencies {
|
||||
implementation(project(":compiler:psi"))
|
||||
implementation(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
|
||||
implementation(intellijCore())
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -24,8 +24,7 @@ dependencies {
|
||||
implementation(project(":analysis:analysis-api-providers"))
|
||||
implementation(project(":analysis:analysis-internal-utils"))
|
||||
|
||||
api(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
|
||||
|
||||
api(intellijCore())
|
||||
|
||||
testApi(projectTests(":compiler:test-infrastructure-utils"))
|
||||
testApi(projectTests(":compiler:test-infrastructure"))
|
||||
@@ -42,21 +41,6 @@ dependencies {
|
||||
testImplementation(project(":analysis:symbol-light-classes"))
|
||||
|
||||
testRuntimeOnly(project(":core:descriptors.runtime"))
|
||||
|
||||
testApi(intellijDep()) {
|
||||
includeJars(
|
||||
"jps-model",
|
||||
"platform-api",
|
||||
"platform-impl",
|
||||
"guava",
|
||||
"trove4j",
|
||||
"asm-all",
|
||||
"log4j",
|
||||
"jdom",
|
||||
"streamex",
|
||||
rootProject = rootProject
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
-4
@@ -5,8 +5,6 @@
|
||||
|
||||
package org.jetbrains.kotlin.analysis.low.level.api.fir
|
||||
|
||||
import com.intellij.openapi.module.ModuleManager
|
||||
import com.intellij.openapi.project.Project
|
||||
import org.jetbrains.kotlin.fir.FirElement
|
||||
import org.jetbrains.kotlin.fir.FirRenderer
|
||||
import org.jetbrains.kotlin.fir.declarations.FirDeclaration
|
||||
@@ -21,8 +19,6 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.FirIdeSession
|
||||
import org.jetbrains.kotlin.analysis.project.structure.getKtModule
|
||||
import org.jetbrains.kotlin.psi.KtElement
|
||||
|
||||
internal fun Project.allModules() = ModuleManager.getInstance(this).modules.toList()
|
||||
|
||||
|
||||
internal fun FirElement.renderWithClassName(renderMode: FirRenderer.RenderMode = FirRenderer.RenderMode.Normal): String =
|
||||
"${this::class.simpleName} `${render(renderMode)}`"
|
||||
|
||||
@@ -7,7 +7,7 @@ dependencies {
|
||||
implementation(project(":core:compiler.common"))
|
||||
implementation(project(":compiler:util"))
|
||||
implementation(project(":compiler:psi"))
|
||||
implementation(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
|
||||
implementation(intellijCore())
|
||||
}
|
||||
|
||||
kotlin {
|
||||
|
||||
@@ -12,7 +12,7 @@ dependencies {
|
||||
implementation(project(":analysis:analysis-api"))
|
||||
implementation(project(":analysis:analysis-internal-utils"))
|
||||
implementation(project(":analysis:project-structure"))
|
||||
implementation(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
|
||||
implementation(intellijCore())
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
Reference in New Issue
Block a user