Remove :idea prefix in IDE FIR modules which are going to stay in kotlin repo
This commit fixes not possibility to build project with `disableKotlinPluginModules` flag on because Gradle tries to resolve `:idea` module which is disabled
This commit is contained in:
committed by
teamcityserver
parent
40872dd4ca
commit
938cd955e1
+3
-3
@@ -887,9 +887,9 @@ tasks {
|
||||
register("frontendApiTests") {
|
||||
dependsOn("dist")
|
||||
dependsOn(
|
||||
":idea:idea-frontend-api:test",
|
||||
":idea:idea-frontend-fir:test",
|
||||
":idea:idea-frontend-fir:idea-fir-low-level-api:test"
|
||||
":idea-frontend-api:test",
|
||||
":idea-frontend-fir:test",
|
||||
":idea-frontend-fir:idea-fir-low-level-api:test"
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -16,8 +16,8 @@ dependencies {
|
||||
testCompile(projectTests(":kotlinx-serialization-ide-plugin"))
|
||||
testCompile(projectTests(":compiler:tests-common"))
|
||||
testCompile(projectTests(":compiler:tests-spec"))
|
||||
testCompile(projectTests(":idea:idea-frontend-fir:idea-fir-low-level-api"))
|
||||
testCompile(projectTests(":idea:idea-frontend-fir"))
|
||||
testCompile(projectTests(":idea-frontend-fir:idea-fir-low-level-api"))
|
||||
testCompile(projectTests(":idea-frontend-fir"))
|
||||
testCompile(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
|
||||
testApiJUnit5()
|
||||
}
|
||||
|
||||
@@ -13,8 +13,8 @@ dependencies {
|
||||
testCompile(projectTests(":idea:idea-maven"))
|
||||
testCompile(projectTests(":idea:idea-fir"))
|
||||
testCompile(projectTests(":idea:idea-fir-performance-tests"))
|
||||
testCompile(projectTests(":idea:idea-frontend-fir"))
|
||||
testCompile(projectTests(":idea:idea-frontend-fir:idea-fir-low-level-api"))
|
||||
testCompile(projectTests(":idea-frontend-fir"))
|
||||
testCompile(projectTests(":idea-frontend-fir:idea-fir-low-level-api"))
|
||||
testCompile(projectTests(":idea:idea-frontend-fir:fir-low-level-api-ide-impl"))
|
||||
testCompile(projectTests(":idea:idea-fir-fe10-binding"))
|
||||
testCompile(projectTests(":j2k"))
|
||||
|
||||
@@ -4,7 +4,7 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation(project(":idea:idea-frontend-fir"))
|
||||
implementation(project(":idea-frontend-fir"))
|
||||
implementation(project(":idea"))
|
||||
|
||||
testRuntime(project(":idea:idea-fir"))
|
||||
|
||||
@@ -4,7 +4,7 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":idea:idea-frontend-fir"))
|
||||
compile(project(":idea-frontend-fir"))
|
||||
compile(project(":idea:formatter"))
|
||||
compile(intellijDep())
|
||||
compile(intellijCoreDep())
|
||||
@@ -22,7 +22,7 @@ dependencies {
|
||||
compile(project(":idea:idea-fir"))
|
||||
testCompile(projectTests(":compiler:tests-common"))
|
||||
testCompile(projectTests(":idea:idea-test-framework"))
|
||||
testCompile(projectTests(":idea:idea-frontend-fir"))
|
||||
testCompile(projectTests(":idea-frontend-fir"))
|
||||
testCompile(project(":kotlin-test:kotlin-test-junit"))
|
||||
testCompile(commonDep("junit:junit"))
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ plugins {
|
||||
|
||||
dependencies {
|
||||
compile(project(":plugins:uast-kotlin-fir"))
|
||||
compile(project(":idea:idea-frontend-fir"))
|
||||
compile(project(":idea-frontend-fir"))
|
||||
compile(project(":idea:idea-frontend-fir:fir-low-level-api-ide-impl"))
|
||||
|
||||
compile(project(":idea:formatter"))
|
||||
@@ -25,7 +25,7 @@ dependencies {
|
||||
testCompile(projectTests(":idea"))
|
||||
testCompile(projectTests(":compiler:tests-common"))
|
||||
testCompile(projectTests(":idea:idea-test-framework"))
|
||||
testCompile(projectTests(":idea:idea-frontend-fir"))
|
||||
testCompile(projectTests(":idea-frontend-fir"))
|
||||
testCompile(project(":kotlin-test:kotlin-test-junit"))
|
||||
testCompile(commonDep("junit:junit"))
|
||||
testCompile(projectTests(":idea:idea-frontend-independent"))
|
||||
|
||||
@@ -10,7 +10,7 @@ dependencies {
|
||||
compileOnly(project(":compiler:frontend"))
|
||||
compileOnly(project(":core:compiler.common"))
|
||||
compileOnly(project(":core:compiler.common.jvm"))
|
||||
compileOnly(project(":idea:idea-frontend-fir:idea-fir-low-level-api"))
|
||||
compileOnly(project(":idea-frontend-fir:idea-fir-low-level-api"))
|
||||
|
||||
compile(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
|
||||
}
|
||||
|
||||
@@ -13,12 +13,12 @@ dependencies {
|
||||
compile(project(":compiler:fir:checkers:checkers.jvm"))
|
||||
compile(project(":compiler:fir:java"))
|
||||
compile(project(":compiler:fir:jvm"))
|
||||
compile(project(":idea:idea-frontend-fir:idea-fir-low-level-api"))
|
||||
compile(project(":idea:idea-frontend-api"))
|
||||
compile(project(":idea-frontend-fir:idea-fir-low-level-api"))
|
||||
compile(project(":idea-frontend-api"))
|
||||
compile(project(":compiler:light-classes"))
|
||||
compile(intellijCoreDep())
|
||||
|
||||
testCompile(projectTests(":idea:idea-frontend-fir:idea-fir-low-level-api"))
|
||||
testCompile(projectTests(":idea-frontend-fir:idea-fir-low-level-api"))
|
||||
testCompile(projectTests(":compiler:tests-common"))
|
||||
testCompile(projectTests(":compiler:test-infrastructure-utils"))
|
||||
testCompile(projectTests(":compiler:test-infrastructure"))
|
||||
@@ -66,7 +66,7 @@ testsJar()
|
||||
val generatorClasspath by configurations.creating
|
||||
|
||||
dependencies {
|
||||
generatorClasspath(project("idea-frontend-fir-generator"))
|
||||
generatorClasspath(project(":idea-frontend-fir:idea-frontend-fir-generator"))
|
||||
}
|
||||
|
||||
val generateCode by tasks.registering(NoDebugJavaExec::class) {
|
||||
|
||||
@@ -5,9 +5,9 @@ plugins {
|
||||
|
||||
dependencies {
|
||||
compile(project(":compiler:psi"))
|
||||
compile(project( ":idea:idea-frontend-fir:idea-fir-low-level-api"))
|
||||
compile(project( ":idea-frontend-fir:idea-fir-low-level-api"))
|
||||
compile(project(":idea:idea-frontend-independent"))
|
||||
compile(project(":idea:idea-frontend-api"))
|
||||
compile(project(":idea-frontend-api"))
|
||||
compile(project(":idea:idea-core"))
|
||||
compile(project(":compiler:fir:fir2ir"))
|
||||
compile(project(":compiler:fir:fir2ir:jvm-backend"))
|
||||
@@ -27,7 +27,7 @@ dependencies {
|
||||
// </temp>
|
||||
|
||||
// <neededFor>`AbstractFirLazyResolveTest` uses fir implementation of references which are not in classpath otherwise
|
||||
testRuntimeOnly(project(":idea:idea-frontend-fir"))
|
||||
testRuntimeOnly(project(":idea-frontend-fir"))
|
||||
// </neededFor>
|
||||
testCompile(projectTests(":compiler:test-infrastructure-utils"))
|
||||
testCompile(projectTests(":compiler:test-infrastructure"))
|
||||
|
||||
@@ -8,7 +8,7 @@ dependencies {
|
||||
implementation(project(":compiler:fir:tree"))
|
||||
implementation(project(":compiler:fir:tree:tree-generator"))
|
||||
implementation(project(":compiler:fir:checkers:checkers-component-generator"))
|
||||
implementation(project(":idea:idea-frontend-api"))
|
||||
implementation(project(":idea-frontend-api"))
|
||||
|
||||
implementation(project(":kotlin-reflect"))
|
||||
implementation(project(":kotlin-reflect-api"))
|
||||
|
||||
@@ -22,8 +22,8 @@ dependencies {
|
||||
compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
|
||||
|
||||
implementation(project(":idea:idea-frontend-independent"))
|
||||
implementation(project(":idea:idea-frontend-api"))
|
||||
implementation(project(":idea:idea-frontend-fir"))
|
||||
implementation(project(":idea-frontend-api"))
|
||||
implementation(project(":idea-frontend-fir"))
|
||||
|
||||
testRuntime(project(":idea:idea-fir"))
|
||||
testImplementation(commonDep("junit:junit"))
|
||||
|
||||
@@ -106,9 +106,9 @@ val projectsToShadow by extra(listOf(
|
||||
":idea:idea-git",
|
||||
":idea:idea-jps-common",
|
||||
":idea:idea-frontend-independent",
|
||||
":idea:idea-frontend-fir",
|
||||
":idea:idea-frontend-api",
|
||||
":idea:idea-frontend-fir:idea-fir-low-level-api",
|
||||
":idea-frontend-fir",
|
||||
":idea-frontend-api",
|
||||
":idea-frontend-fir:idea-fir-low-level-api",
|
||||
":idea:idea-frontend-fir:fir-low-level-api-ide-impl",
|
||||
":idea:idea-fir-performance-tests",
|
||||
":idea:idea-fir",
|
||||
|
||||
+10
-4
@@ -496,10 +496,10 @@ if (!buildProperties.getBoolean("disableKotlinPluginModules", false) && attached
|
||||
}
|
||||
|
||||
include ":generators:frontend-api-generator",
|
||||
":idea:idea-frontend-fir:idea-fir-low-level-api",
|
||||
":idea:idea-frontend-fir:idea-frontend-fir-generator",
|
||||
":idea:idea-frontend-fir",
|
||||
":idea:idea-frontend-api"
|
||||
":idea-frontend-fir:idea-fir-low-level-api",
|
||||
":idea-frontend-fir:idea-frontend-fir-generator",
|
||||
":idea-frontend-fir",
|
||||
":idea-frontend-api"
|
||||
|
||||
if (buildProperties.inJpsBuildIdeaSync) {
|
||||
include ":kotlin-stdlib:jps-build"
|
||||
@@ -675,6 +675,12 @@ project(':kotlinx-serialization-compiler-plugin').projectDir = file("$rootDir/pl
|
||||
project(':kotlin-serialization').projectDir = file("$rootDir/libraries/tools/kotlin-serialization")
|
||||
project(':kotlin-serialization-unshaded').projectDir = file("$rootDir/libraries/tools/kotlin-serialization-unshaded")
|
||||
|
||||
project(":idea-frontend-fir:idea-fir-low-level-api").projectDir = "$rootDir/idea/idea-frontend-fir/idea-fir-low-level-api" as File
|
||||
project(":idea-frontend-fir:idea-frontend-fir-generator").projectDir = "$rootDir/idea/idea-frontend-fir/idea-frontend-fir-generator" as File
|
||||
project(":idea-frontend-fir").projectDir = "$rootDir/idea/idea-frontend-fir" as File
|
||||
project(":idea-frontend-api").projectDir = "$rootDir/idea/idea-frontend-api" as File
|
||||
|
||||
|
||||
// Uncomment to use locally built protobuf-relocated
|
||||
// includeBuild("dependencies/protobuf")
|
||||
if (buildProperties.isKotlinNativeEnabled) {
|
||||
|
||||
Reference in New Issue
Block a user