From 405670e1113b405405c7bdb834850e1831b55612 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Wed, 8 Sep 2021 15:59:27 +0300 Subject: [PATCH] Merge `:compiler:fir:jvm` module into `:compiler:fir:java` --- build.gradle.kts | 1 - compiler/cli/build.gradle.kts | 1 - .../fir/fir2ir/jvm-backend/build.gradle.kts | 2 +- compiler/fir/java/build.gradle.kts | 2 +- .../kotlin/fir/resolve/FirJavaClassMapper.kt | 0 .../resolve/FirJavaSyntheticNamesProvider.kt | 0 .../jvm/ConeEquivalentCallConflictResolver.kt | 0 .../jvm/JvmCallConflictResolverFactory.kt | 0 .../JvmPlatformOverloadsConflictResolver.kt | 0 .../fir/resolve/scopes/JvmMappedScopes.kt | 0 .../kotlin/fir/scopes/jvm/DescriptorUtils.kt | 0 .../kotlin/fir/scopes/jvm/JvmMappedScope.kt | 0 .../kotlin/fir/types/jvm/FirJavaTypeRef.kt | 0 compiler/fir/jvm/build.gradle.kts | 18 ------------------ compiler/tests-common/build.gradle.kts | 1 - idea/idea-frontend-fir/build.gradle.kts | 1 - .../idea-fir-low-level-api/build.gradle.kts | 1 - settings.gradle | 1 - 18 files changed, 2 insertions(+), 26 deletions(-) rename compiler/fir/{jvm => java}/src/org/jetbrains/kotlin/fir/resolve/FirJavaClassMapper.kt (100%) rename compiler/fir/{jvm => java}/src/org/jetbrains/kotlin/fir/resolve/FirJavaSyntheticNamesProvider.kt (100%) rename compiler/fir/{jvm => java}/src/org/jetbrains/kotlin/fir/resolve/calls/jvm/ConeEquivalentCallConflictResolver.kt (100%) rename compiler/fir/{jvm => java}/src/org/jetbrains/kotlin/fir/resolve/calls/jvm/JvmCallConflictResolverFactory.kt (100%) rename compiler/fir/{jvm => java}/src/org/jetbrains/kotlin/fir/resolve/calls/jvm/JvmPlatformOverloadsConflictResolver.kt (100%) rename compiler/fir/{jvm => java}/src/org/jetbrains/kotlin/fir/resolve/scopes/JvmMappedScopes.kt (100%) rename compiler/fir/{jvm => java}/src/org/jetbrains/kotlin/fir/scopes/jvm/DescriptorUtils.kt (100%) rename compiler/fir/{jvm => java}/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt (100%) rename compiler/fir/{jvm => java}/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt (100%) delete mode 100644 compiler/fir/jvm/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts index cb3566cca29..75d0b1dfb06 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -245,7 +245,6 @@ extra["compilerModules"] = arrayOf( ":compiler:fir:fir2ir", ":compiler:fir:fir2ir:jvm-backend", ":compiler:fir:java", - ":compiler:fir:jvm", ":compiler:fir:checkers", ":compiler:fir:checkers:checkers.jvm", ":compiler:fir:entrypoint", diff --git a/compiler/cli/build.gradle.kts b/compiler/cli/build.gradle.kts index 4f25e041b38..1cf599e0ced 100644 --- a/compiler/cli/build.gradle.kts +++ b/compiler/cli/build.gradle.kts @@ -24,7 +24,6 @@ dependencies { compile(commonDep("org.jline", "jline")) compile(project(":compiler:fir:raw-fir:psi2fir")) compile(project(":compiler:fir:resolve")) - compile(project(":compiler:fir:jvm")) compile(project(":compiler:fir:java")) implementation(project(":compiler:fir:entrypoint")) compile(project(":compiler:fir:fir2ir")) diff --git a/compiler/fir/fir2ir/jvm-backend/build.gradle.kts b/compiler/fir/fir2ir/jvm-backend/build.gradle.kts index 53a6239ec19..3fdfac22ece 100644 --- a/compiler/fir/fir2ir/jvm-backend/build.gradle.kts +++ b/compiler/fir/fir2ir/jvm-backend/build.gradle.kts @@ -8,7 +8,7 @@ dependencies { compileOnly(project(":compiler:backend.common.jvm")) compileOnly(project(":compiler:fir:cones")) compileOnly(project(":compiler:fir:resolve")) - compileOnly(project(":compiler:fir:jvm")) + compileOnly(project(":compiler:fir:java")) compileOnly(project(":compiler:fir:tree")) compileOnly(project(":compiler:fir:fir2ir")) compileOnly(project(":compiler:fir:fir-serialization")) diff --git a/compiler/fir/java/build.gradle.kts b/compiler/fir/java/build.gradle.kts index ad8885691d8..9e3bb174869 100644 --- a/compiler/fir/java/build.gradle.kts +++ b/compiler/fir/java/build.gradle.kts @@ -7,11 +7,11 @@ plugins { dependencies { api(project(":core:compiler.common.jvm")) api(project(":core:metadata.jvm")) + api(project(":compiler:config.jvm")) api(project(":compiler:resolution.common.jvm")) api(project(":compiler:frontend.common")) api(project(":compiler:fir:resolve")) api(project(":compiler:fir:checkers")) - api(project(":compiler:fir:jvm")) api(project(":compiler:fir:fir-deserialization")) implementation(project(":core:deserialization.common.jvm")) diff --git a/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/resolve/FirJavaClassMapper.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/resolve/FirJavaClassMapper.kt similarity index 100% rename from compiler/fir/jvm/src/org/jetbrains/kotlin/fir/resolve/FirJavaClassMapper.kt rename to compiler/fir/java/src/org/jetbrains/kotlin/fir/resolve/FirJavaClassMapper.kt diff --git a/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/resolve/FirJavaSyntheticNamesProvider.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/resolve/FirJavaSyntheticNamesProvider.kt similarity index 100% rename from compiler/fir/jvm/src/org/jetbrains/kotlin/fir/resolve/FirJavaSyntheticNamesProvider.kt rename to compiler/fir/java/src/org/jetbrains/kotlin/fir/resolve/FirJavaSyntheticNamesProvider.kt diff --git a/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/resolve/calls/jvm/ConeEquivalentCallConflictResolver.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/resolve/calls/jvm/ConeEquivalentCallConflictResolver.kt similarity index 100% rename from compiler/fir/jvm/src/org/jetbrains/kotlin/fir/resolve/calls/jvm/ConeEquivalentCallConflictResolver.kt rename to compiler/fir/java/src/org/jetbrains/kotlin/fir/resolve/calls/jvm/ConeEquivalentCallConflictResolver.kt diff --git a/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/resolve/calls/jvm/JvmCallConflictResolverFactory.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/resolve/calls/jvm/JvmCallConflictResolverFactory.kt similarity index 100% rename from compiler/fir/jvm/src/org/jetbrains/kotlin/fir/resolve/calls/jvm/JvmCallConflictResolverFactory.kt rename to compiler/fir/java/src/org/jetbrains/kotlin/fir/resolve/calls/jvm/JvmCallConflictResolverFactory.kt diff --git a/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/resolve/calls/jvm/JvmPlatformOverloadsConflictResolver.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/resolve/calls/jvm/JvmPlatformOverloadsConflictResolver.kt similarity index 100% rename from compiler/fir/jvm/src/org/jetbrains/kotlin/fir/resolve/calls/jvm/JvmPlatformOverloadsConflictResolver.kt rename to compiler/fir/java/src/org/jetbrains/kotlin/fir/resolve/calls/jvm/JvmPlatformOverloadsConflictResolver.kt diff --git a/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/resolve/scopes/JvmMappedScopes.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/resolve/scopes/JvmMappedScopes.kt similarity index 100% rename from compiler/fir/jvm/src/org/jetbrains/kotlin/fir/resolve/scopes/JvmMappedScopes.kt rename to compiler/fir/java/src/org/jetbrains/kotlin/fir/resolve/scopes/JvmMappedScopes.kt diff --git a/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/scopes/jvm/DescriptorUtils.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/scopes/jvm/DescriptorUtils.kt similarity index 100% rename from compiler/fir/jvm/src/org/jetbrains/kotlin/fir/scopes/jvm/DescriptorUtils.kt rename to compiler/fir/java/src/org/jetbrains/kotlin/fir/scopes/jvm/DescriptorUtils.kt diff --git a/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt similarity index 100% rename from compiler/fir/jvm/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt rename to compiler/fir/java/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt diff --git a/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt similarity index 100% rename from compiler/fir/jvm/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt rename to compiler/fir/java/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt diff --git a/compiler/fir/jvm/build.gradle.kts b/compiler/fir/jvm/build.gradle.kts deleted file mode 100644 index 3cf86d6a740..00000000000 --- a/compiler/fir/jvm/build.gradle.kts +++ /dev/null @@ -1,18 +0,0 @@ -plugins { - kotlin("jvm") - id("jps-compatible") -} - -dependencies { - implementation(project(":core:compiler.common.jvm")) - implementation(project(":compiler:config.jvm")) - implementation(project(":compiler:resolution.common.jvm")) - implementation(project(":compiler:fir:cones")) - implementation(project(":compiler:fir:tree")) - implementation(project(":compiler:fir:resolve")) -} - -sourceSets { - "main" { projectDefault() } - "test" {} -} diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index df81e8f860e..7a023a9a0bf 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -18,7 +18,6 @@ dependencies { testCompile(project(":compiler:fir:raw-fir:psi2fir")) testCompile(project(":compiler:fir:raw-fir:light-tree2fir")) testCompile(project(":compiler:fir:fir2ir")) - testCompile(project(":compiler:fir:jvm")) testCompile(project(":compiler:fir:fir2ir:jvm-backend")) testCompile(project(":compiler:fir:fir-serialization")) testCompile(project(":compiler:fir:fir-deserialization")) diff --git a/idea/idea-frontend-fir/build.gradle.kts b/idea/idea-frontend-fir/build.gradle.kts index a530a748c86..2ed03acf520 100644 --- a/idea/idea-frontend-fir/build.gradle.kts +++ b/idea/idea-frontend-fir/build.gradle.kts @@ -12,7 +12,6 @@ dependencies { compile(project(":compiler:fir:checkers")) compile(project(":compiler:fir:checkers:checkers.jvm")) compile(project(":compiler:fir:java")) - compile(project(":compiler:fir:jvm")) compile(project(":idea-frontend-fir:idea-fir-low-level-api")) compile(project(":idea-frontend-api")) compile(project(":compiler:light-classes")) diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/build.gradle.kts b/idea/idea-frontend-fir/idea-fir-low-level-api/build.gradle.kts index 916b99d48ad..b105837f56e 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/build.gradle.kts +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/build.gradle.kts @@ -12,7 +12,6 @@ dependencies { compile(project(":compiler:fir:checkers")) compile(project(":compiler:fir:checkers:checkers.jvm")) compile(project(":compiler:fir:java")) - compile(project(":compiler:fir:jvm")) compile(project(":compiler:backend.common.jvm")) testCompile(project(":idea-frontend-fir")) implementation(project(":compiler:ir.psi2ir")) diff --git a/settings.gradle b/settings.gradle index a852ec16d0e..f2f304ec7d2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -278,7 +278,6 @@ include ":compiler:fir", ":compiler:fir:java", ":compiler:fir:modularized-tests", ":compiler:fir:dump", - ":compiler:fir:jvm", ":compiler:fir:checkers", ":compiler:fir:checkers:checkers.jvm", ":compiler:fir:checkers:checkers-component-generator",