Rename :core:descriptors.common to :core:compiler.common

build.gradle.kts

@@ -265,7 +265,7 @@ extra["compilerModules"] = arrayOf(
     ":kotlin-build-common",
     ":core:metadata",
     ":core:metadata.jvm",
-    ":core:descriptors.common",
+    ":core:compiler.common",
     ":core:descriptors",
     ":core:descriptors.jvm",
     ":core:descriptors.runtime",
@@ -295,7 +295,7 @@ extra["compilerModulesForJps"] = listOf(
     ":kotlin-compiler-runner",
     ":daemon-common",
     ":daemon-common-new",
-    ":core:descriptors.common",
+    ":core:compiler.common",
     ":core:descriptors",
     ":core:descriptors.jvm",
     ":idea:idea-jps-common",

compiler/config/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 
 dependencies {
     api(project(":core:metadata"))
-    api(project(":core:descriptors.common"))
+    api(project(":core:compiler.common"))
     api(project(":compiler:util"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }

compiler/fir/cones/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 dependencies {
-    api(project(":core:descriptors.common"))
+    api(project(":core:compiler.common"))
 
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }

compiler/fir/tree/tree-generator/build.gradle.kts

@@ -11,7 +11,7 @@ val compileOnly by configurations
 runtimeOnly.extendsFrom(compileOnly)
 
 dependencies {
-    implementation(project(":core:descriptors.common"))
+    implementation(project(":core:compiler.common"))
     implementation(project(":compiler:frontend.common"))
     implementation(project(":compiler:fir:cones"))
 

core/descriptors/build.gradle.kts

@@ -7,7 +7,7 @@ jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
-    compile(project(":core:descriptors.common"))
+    compile(project(":core:compiler.common"))
     compile(project(":core:util.runtime"))
     compile(kotlinStdlib())
     compile(project(":kotlin-annotations-jvm"))

generators/tests/org/jetbrains/kotlin/generators/frontend/GenerateKeywordStrings.java

@@ -31,7 +31,7 @@ import java.util.Iterator;
 import java.util.List;
 
 public class GenerateKeywordStrings {
-    public static final File DEST_FILE = new File("core/descriptors.common/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java");
+    public static final File DEST_FILE = new File("core/compiler.common/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java");
 
     @NotNull
     public static String generate() throws IOException {

idea/idea-frontend-api/build.gradle.kts

@@ -8,7 +8,7 @@ dependencies {
 
     compileOnly(project(":compiler:psi"))
     compileOnly(project(":compiler:frontend"))
-    compileOnly(project(":core:descriptors.common"))
+    compileOnly(project(":core:compiler.common"))
     compileOnly(project(":idea:idea-frontend-independent"))
     compileOnly(project(":compiler:psi"))
     compileOnly(intellijCoreDep())

libraries/reflect/build.gradle.kts

@@ -47,8 +47,8 @@ dependencies {
     embedded(project(":kotlin-reflect-api"))
     embedded(project(":core:metadata"))
     embedded(project(":core:metadata.jvm"))
+    embedded(project(":core:compiler.common"))
     embedded(project(":core:descriptors"))
-    embedded(project(":core:descriptors.common"))
     embedded(project(":core:descriptors.jvm"))
     embedded(project(":core:deserialization"))
     embedded(project(":core:descriptors.runtime"))

prepare/idea-plugin/build.gradle.kts

@@ -26,8 +26,8 @@ val projectsToShadow by extra(listOf(
         ":daemon-common-new",
         ":core:metadata",
         ":core:metadata.jvm",
+        ":core:compiler.common",
         ":core:descriptors",
-        ":core:descriptors.common",
         ":core:descriptors.jvm",
         ":core:deserialization",
         ":idea:jvm-debugger:eval4j",

settings.gradle

@@ -133,7 +133,7 @@ include ":benchmarks",
         ":native:kotlin-klib-commonizer-embeddable",
         ":jps-plugin",
         ":kotlin-jps-plugin",
-        ":core:descriptors.common",
+        ":core:compiler.common",
         ":core:descriptors",
         ":core:descriptors.jvm",
         ":core:deserialization",