From dfea915f9282874bf5c0e6bd8cbf704fc437d449 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 5 May 2021 19:39:26 +0200 Subject: [PATCH] Remove dependency of frontend on compiler.common.jvm Looks like it was added accidentally in 564d382b9d; common frontend shouldn't depend on JVM-specific modules. Since then, it has been accidentally used in two places in ir.serialization.common to refer to JVM specifics, and that should be abstracted away in the future. --- compiler/frontend/build.gradle.kts | 1 - compiler/ir/serialization.common/build.gradle.kts | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler/frontend/build.gradle.kts b/compiler/frontend/build.gradle.kts index 59f5a36e42f..53b465583cb 100644 --- a/compiler/frontend/build.gradle.kts +++ b/compiler/frontend/build.gradle.kts @@ -15,7 +15,6 @@ dependencies { compile(project(":compiler:frontend.common")) compile(project(":kotlin-script-runtime")) compile(commonDep("io.javaslang","javaslang")) - api(project(":core:compiler.common.jvm")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("trove4j", "guava", rootProject = rootProject) } } diff --git a/compiler/ir/serialization.common/build.gradle.kts b/compiler/ir/serialization.common/build.gradle.kts index 0756469676a..23dab8c8e16 100644 --- a/compiler/ir/serialization.common/build.gradle.kts +++ b/compiler/ir/serialization.common/build.gradle.kts @@ -12,6 +12,9 @@ dependencies { compile(project(":compiler:util")) compileOnly(project(":kotlin-reflect-api")) + // TODO: move usages of JvmAnnotationNames and hasEnhancedNullability to ir.serialization.jvm and remove this dependency. + implementation(project(":core:compiler.common.jvm")) + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } }