diff --git a/build.gradle.kts b/build.gradle.kts index 733b8e2f09d..dbb3ed5450d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -131,7 +131,6 @@ if (!project.hasProperty("versions.kotlin-native")) { val irCompilerModules = arrayOf( ":compiler:ir.tree", - ":compiler:ir.tree.impl", ":compiler:ir.serialization.common", ":compiler:ir.serialization.js", ":compiler:ir.serialization.jvm", diff --git a/compiler/cli/build.gradle.kts b/compiler/cli/build.gradle.kts index f462f5770db..e3cd51e3fd9 100644 --- a/compiler/cli/build.gradle.kts +++ b/compiler/cli/build.gradle.kts @@ -35,9 +35,6 @@ dependencies { api(project(":kotlin-util-klib")) api(project(":kotlin-util-io")) - // TODO: as soon as cli-jvm is extracted out of this module, move this dependency there - compileOnly(project(":compiler:ir.tree.impl")) - compileOnly(toolsJarApi()) compileOnly(intellijCore()) compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j")) diff --git a/compiler/cli/cli-js/build.gradle.kts b/compiler/cli/cli-js/build.gradle.kts index bbcc24fbef9..5fda7a7f804 100644 --- a/compiler/cli/cli-js/build.gradle.kts +++ b/compiler/cli/cli-js/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { api(project(":compiler:backend-common")) api(project(":compiler:ir.backend.common")) api(project(":compiler:ir.serialization.js")) - api(project(":compiler:ir.tree.impl")) + api(project(":compiler:ir.tree")) api(project(":compiler:backend.js")) api(project(":compiler:backend.wasm")) api(project(":js:js.translator")) diff --git a/compiler/fir/entrypoint/build.gradle.kts b/compiler/fir/entrypoint/build.gradle.kts index c64ae0c24be..e2ffc4f5cef 100644 --- a/compiler/fir/entrypoint/build.gradle.kts +++ b/compiler/fir/entrypoint/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { implementation(project(":compiler:backend.jvm")) implementation(project(":compiler:ir.serialization.common")) implementation(project(":compiler:ir.serialization.jvm")) - implementation(project(":compiler:ir.tree.impl")) + implementation(project(":compiler:ir.tree")) compileOnly(project(":kotlin-reflect-api")) compileOnly(intellijCore()) diff --git a/compiler/fir/fir2ir/jvm-backend/build.gradle.kts b/compiler/fir/fir2ir/jvm-backend/build.gradle.kts index b2cc17fd004..f2f3889524e 100644 --- a/compiler/fir/fir2ir/jvm-backend/build.gradle.kts +++ b/compiler/fir/fir2ir/jvm-backend/build.gradle.kts @@ -15,7 +15,6 @@ dependencies { compileOnly(project(":compiler:fir:fir2ir")) compileOnly(project(":compiler:fir:fir-serialization")) compileOnly(project(":compiler:ir.tree")) - compileOnly(project(":compiler:ir.tree.impl")) compileOnly(project(":compiler:backend")) compileOnly(project(":compiler:backend.jvm")) api(project(":compiler:ir.serialization.common")) diff --git a/compiler/ir/backend.jvm/build.gradle.kts b/compiler/ir/backend.jvm/build.gradle.kts index 1e25b6da3d8..033e4931a63 100644 --- a/compiler/ir/backend.jvm/build.gradle.kts +++ b/compiler/ir/backend.jvm/build.gradle.kts @@ -8,7 +8,6 @@ dependencies { api(project(":compiler:ir.tree")) api(project(":compiler:ir.backend.common")) api(project(":compiler:backend.common.jvm")) - compileOnly(project(":compiler:ir.tree.impl")) compileOnly(intellijCore()) compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all")) } diff --git a/compiler/ir/backend.jvm/codegen/build.gradle.kts b/compiler/ir/backend.jvm/codegen/build.gradle.kts index e2b7fb4aa50..a6eb9c39068 100644 --- a/compiler/ir/backend.jvm/codegen/build.gradle.kts +++ b/compiler/ir/backend.jvm/codegen/build.gradle.kts @@ -7,7 +7,6 @@ dependencies { api(project(":compiler:ir.tree")) api(project(":compiler:ir.backend.common")) api(project(":compiler:backend.jvm")) - implementation(project(":compiler:ir.tree.impl")) compileOnly(intellijCore()) } diff --git a/compiler/ir/backend.jvm/entrypoint/build.gradle.kts b/compiler/ir/backend.jvm/entrypoint/build.gradle.kts index 12ee9cf535e..808b8d3846f 100644 --- a/compiler/ir/backend.jvm/entrypoint/build.gradle.kts +++ b/compiler/ir/backend.jvm/entrypoint/build.gradle.kts @@ -6,7 +6,7 @@ plugins { dependencies { api(project(":compiler:ir.psi2ir")) api(project(":compiler:backend.jvm")) - api(project(":compiler:ir.tree.impl")) + api(project(":compiler:ir.tree")) api(project(":compiler:ir.serialization.jvm")) implementation(project(":compiler:backend.jvm.lower")) implementation(project(":compiler:backend.jvm.codegen")) diff --git a/compiler/ir/backend.jvm/lower/build.gradle.kts b/compiler/ir/backend.jvm/lower/build.gradle.kts index 59330b7bd38..6e9e15edc69 100644 --- a/compiler/ir/backend.jvm/lower/build.gradle.kts +++ b/compiler/ir/backend.jvm/lower/build.gradle.kts @@ -7,7 +7,6 @@ dependencies { api(project(":compiler:ir.tree")) api(project(":compiler:ir.backend.common")) api(project(":compiler:backend.jvm")) - implementation(project(":compiler:ir.tree.impl")) compileOnly(intellijCore()) compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j")) } diff --git a/compiler/ir/ir.interpreter/build.gradle.kts b/compiler/ir/ir.interpreter/build.gradle.kts index d32113b962b..21ebc6991d2 100644 --- a/compiler/ir/ir.interpreter/build.gradle.kts +++ b/compiler/ir/ir.interpreter/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } dependencies { - compileOnly(project(":compiler:ir.tree.impl")) + compileOnly(project(":compiler:ir.tree")) compileOnly(project(":kotlin-reflect-api")) } diff --git a/compiler/tests-common-new/build.gradle.kts b/compiler/tests-common-new/build.gradle.kts index 5bf91579e63..f7140a2201d 100644 --- a/compiler/tests-common-new/build.gradle.kts +++ b/compiler/tests-common-new/build.gradle.kts @@ -8,7 +8,7 @@ plugins { dependencies { testApi(project(":compiler:fir:entrypoint")) testApi(project(":compiler:cli")) - testImplementation(project(":compiler:ir.tree.impl")) + testImplementation(project(":compiler:ir.tree")) testImplementation(project(":compiler:backend.jvm.entrypoint")) testImplementation(project(":compiler:backend.jvm.lower")) testImplementation(intellijCore()) diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index 2b6d1976c5e..1dc7dc05488 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { testApi(project(":compiler:util")) testApi(project(":compiler:tests-mutes")) testApi(project(":compiler:backend")) - testApi(project(":compiler:ir.tree.impl")) + testApi(project(":compiler:ir.tree")) testApi(project(":compiler:fir:tree")) testApi(project(":compiler:fir:raw-fir:psi2fir")) testApi(project(":compiler:fir:raw-fir:light-tree2fir")) diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts index 2ae25ccaf8b..4e408de40aa 100644 --- a/generators/build.gradle.kts +++ b/generators/build.gradle.kts @@ -44,7 +44,6 @@ dependencies { wasmApi(project(":wasm:wasm.ir")) wasmApi(kotlinStdlib()) interpreterApi(project(":compiler:ir.tree")) - interpreterApi(project(":compiler:ir.tree.impl")) interpreterApi(project(":compiler:ir.psi2ir")) protobufApi(kotlinStdlib()) protobufCompareApi(projectTests(":kotlin-build-common")) diff --git a/kotlin-native/backend.native/build.gradle b/kotlin-native/backend.native/build.gradle index a34730dae84..f99facbf695 100644 --- a/kotlin-native/backend.native/build.gradle +++ b/kotlin-native/backend.native/build.gradle @@ -116,7 +116,6 @@ dependencies { compilerApi project(":native:kotlin-native-utils") compilerApi project(":core:descriptors") compilerApi project(":compiler:ir.tree") - compilerApi project(":compiler:ir.tree.impl") compilerApi project(":compiler:ir.backend.common") compilerApi project(":compiler:util") compilerApi project(":native:frontend.native") diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle index ae639bb0914..1655ea9c829 100644 --- a/kotlin-native/backend.native/tests/build.gradle +++ b/kotlin-native/backend.native/tests/build.gradle @@ -6155,7 +6155,6 @@ dependencies { nopPluginApi project(":native:kotlin-native-utils") nopPluginApi project(":core:descriptors") nopPluginApi project(":compiler:ir.tree") - nopPluginApi project(":compiler:ir.tree.impl") nopPluginApi project(":compiler:ir.backend.common") nopPluginApi project(":compiler:util") nopPluginApi project(":native:frontend.native") diff --git a/libraries/scripting/js-test/build.gradle.kts b/libraries/scripting/js-test/build.gradle.kts index c39ee06071f..0db2c589892 100644 --- a/libraries/scripting/js-test/build.gradle.kts +++ b/libraries/scripting/js-test/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { testApi(project(":kotlin-scripting-compiler-js")) testApi(project(":compiler:cli")) testApi(project(":compiler:backend.js")) - testApi(project(":compiler:ir.tree.impl")) + testApi(project(":compiler:ir.tree")) testApi(project(":js:js.engines")) testApi(intellijCore()) diff --git a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts index 42da870f1dc..4da2486de64 100644 --- a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts @@ -19,7 +19,7 @@ dependencies { compileOnly(project(":compiler:backend")) compileOnly(project(":compiler:ir.backend.common")) compileOnly(project(":compiler:backend.jvm")) - compileOnly(project(":compiler:ir.tree.impl")) + compileOnly(project(":compiler:ir.tree")) compileOnly(project(":kotlin-android-extensions-runtime")) compileOnly(intellijCore()) compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all")) diff --git a/plugins/fir-plugin-prototype/build.gradle.kts b/plugins/fir-plugin-prototype/build.gradle.kts index d6f24cc5971..290ab430c1e 100644 --- a/plugins/fir-plugin-prototype/build.gradle.kts +++ b/plugins/fir-plugin-prototype/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { compileOnly(project(":compiler:fir:checkers")) compileOnly(project(":compiler:fir:fir2ir")) compileOnly(project(":compiler:ir.backend.common")) - compileOnly(project(":compiler:ir.tree.impl")) + compileOnly(project(":compiler:ir.tree")) compileOnly(project(":compiler:fir:entrypoint")) compileOnly(project(":compiler:plugin-api")) compileOnly(intellijCore()) diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts index 5f6270bed98..69dd63faf7a 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { compileOnly(project(":compiler:frontend")) compileOnly(project(":compiler:backend")) compileOnly(project(":compiler:ir.backend.common")) - compileOnly(project(":compiler:ir.tree.impl")) + compileOnly(project(":compiler:ir.tree")) compileOnly(project(":js:js.frontend")) compileOnly(project(":js:js.translator")) compileOnly(project(":kotlin-util-klib-metadata")) diff --git a/plugins/parcelize/parcelize-compiler/parcelize.backend/build.gradle.kts b/plugins/parcelize/parcelize-compiler/parcelize.backend/build.gradle.kts index e147bb20237..bbe9d70a752 100644 --- a/plugins/parcelize/parcelize-compiler/parcelize.backend/build.gradle.kts +++ b/plugins/parcelize/parcelize-compiler/parcelize.backend/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { compileOnly(project(":compiler:backend")) compileOnly(project(":compiler:ir.backend.common")) compileOnly(project(":compiler:backend.jvm")) - compileOnly(project(":compiler:ir.tree.impl")) + compileOnly(project(":compiler:ir.tree")) compileOnly(project(":compiler:fir:tree")) compileOnly(intellijCore()) compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all")) diff --git a/plugins/parcelize/parcelize-compiler/parcelize.k2/build.gradle.kts b/plugins/parcelize/parcelize-compiler/parcelize.k2/build.gradle.kts index 899786bbbe8..592a310a7e1 100644 --- a/plugins/parcelize/parcelize-compiler/parcelize.k2/build.gradle.kts +++ b/plugins/parcelize/parcelize-compiler/parcelize.k2/build.gradle.kts @@ -15,7 +15,7 @@ dependencies { compileOnly(project(":compiler:fir:checkers")) compileOnly(project(":compiler:fir:checkers:checkers.jvm")) compileOnly(project(":compiler:ir.backend.common")) - compileOnly(project(":compiler:ir.tree.impl")) + compileOnly(project(":compiler:ir.tree")) compileOnly(project(":compiler:fir:entrypoint")) compileOnly(project(":kotlin-reflect-api")) } diff --git a/plugins/scripting/scripting-compiler-js/build.gradle.kts b/plugins/scripting/scripting-compiler-js/build.gradle.kts index 88f0438d10e..9614cef98c7 100644 --- a/plugins/scripting/scripting-compiler-js/build.gradle.kts +++ b/plugins/scripting/scripting-compiler-js/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { compileOnly(project(":compiler:cli")) compileOnly(project(":compiler:backend.js")) compileOnly(project(":core:descriptors.runtime")) - compileOnly(project(":compiler:ir.tree.impl")) + compileOnly(project(":compiler:ir.tree")) compileOnly(project(":kotlin-reflect-api")) api(project(":kotlin-scripting-common")) api(project(":kotlin-scripting-js")) diff --git a/plugins/scripting/scripting-compiler/build.gradle.kts b/plugins/scripting/scripting-compiler/build.gradle.kts index 1578b270282..a8d8710e8f1 100644 --- a/plugins/scripting/scripting-compiler/build.gradle.kts +++ b/plugins/scripting/scripting-compiler/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { compileOnly(project(":compiler:plugin-api")) compileOnly(project(":compiler:cli")) compileOnly(project(":core:descriptors.runtime")) - compileOnly(project(":compiler:ir.tree.impl")) + compileOnly(project(":compiler:ir.tree")) compileOnly(project(":compiler:backend.jvm.entrypoint")) compileOnly(project(":kotlin-reflect-api")) api(project(":kotlin-scripting-common")) diff --git a/settings.gradle b/settings.gradle index 0d399a590a5..11c7c397764 100644 --- a/settings.gradle +++ b/settings.gradle @@ -128,7 +128,6 @@ include ":benchmarks", ":compiler:cli-common", ":compiler:ir.tree", ":compiler:ir.tree:tree-generator", - ":compiler:ir.tree.impl", ":compiler:ir.psi2ir", ":compiler:ir.ir2cfg", ":compiler:ir.backend.common", @@ -674,7 +673,6 @@ project(':kotlin-compiler-runner').projectDir = "$rootDir/compiler/compiler-runn project(':kotlin-ant').projectDir = "$rootDir/ant" as File project(':compiler:ir.tree').projectDir = "$rootDir/compiler/ir/ir.tree" as File project(':compiler:ir.tree:tree-generator').projectDir = "$rootDir/compiler/ir/ir.tree/tree-generator" as File -project(':compiler:ir.tree.impl').projectDir = "$rootDir/compiler/ir/ir.tree.impl" as File project(':compiler:ir.psi2ir').projectDir = "$rootDir/compiler/ir/ir.psi2ir" as File project(':compiler:ir.ir2cfg').projectDir = "$rootDir/compiler/ir/ir.ir2cfg" as File project(':compiler:ir.backend.common').projectDir = "$rootDir/compiler/ir/backend.common" as File