From 9e1e525343da7981eebcecaf761d5c01891d8a08 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Wed, 2 Sep 2020 18:08:22 +0300 Subject: [PATCH] Fix circular dependency between :core:compiler:common.jvm and :core:metadata.jvm --- core/compiler.common.jvm/build.gradle.kts | 1 - core/metadata.jvm/build.gradle.kts | 2 +- .../src/org/jetbrains/kotlin/load/kotlin/KotlinClassFinder.kt | 0 .../org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.kt | 0 .../src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt | 0 .../src/org/jetbrains/kotlin/load/kotlin/PackagePartProvider.kt | 0 .../jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt | 0 7 files changed, 1 insertion(+), 2 deletions(-) rename core/{compiler.common.jvm => metadata.jvm}/src/org/jetbrains/kotlin/load/kotlin/KotlinClassFinder.kt (100%) rename core/{compiler.common.jvm => metadata.jvm}/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.kt (100%) rename core/{compiler.common.jvm => metadata.jvm}/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt (100%) rename core/{compiler.common.jvm => metadata.jvm}/src/org/jetbrains/kotlin/load/kotlin/PackagePartProvider.kt (100%) rename core/{compiler.common.jvm => metadata.jvm}/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt (100%) diff --git a/core/compiler.common.jvm/build.gradle.kts b/core/compiler.common.jvm/build.gradle.kts index 991f5b18028..e059558821a 100644 --- a/core/compiler.common.jvm/build.gradle.kts +++ b/core/compiler.common.jvm/build.gradle.kts @@ -8,7 +8,6 @@ javaHome = rootProject.extra["JDK_16"] as String dependencies { api(project(":core:compiler.common")) - api(project(":core:metadata.jvm")) } sourceSets { diff --git a/core/metadata.jvm/build.gradle.kts b/core/metadata.jvm/build.gradle.kts index 8519cf231c4..5c420c20f77 100644 --- a/core/metadata.jvm/build.gradle.kts +++ b/core/metadata.jvm/build.gradle.kts @@ -7,7 +7,7 @@ jvmTarget = "1.6" javaHome = rootProject.extra["JDK_16"] as String dependencies { - compile(project(":core:metadata")) + api(project(":core:metadata")) api(project(":core:compiler.common.jvm")) } diff --git a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinClassFinder.kt b/core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinClassFinder.kt similarity index 100% rename from core/compiler.common.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinClassFinder.kt rename to core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinClassFinder.kt diff --git a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.kt b/core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.kt similarity index 100% rename from core/compiler.common.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.kt rename to core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.kt diff --git a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt b/core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt similarity index 100% rename from core/compiler.common.jvm/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt rename to core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt diff --git a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/kotlin/PackagePartProvider.kt b/core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/PackagePartProvider.kt similarity index 100% rename from core/compiler.common.jvm/src/org/jetbrains/kotlin/load/kotlin/PackagePartProvider.kt rename to core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/PackagePartProvider.kt diff --git a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt b/core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt similarity index 100% rename from core/compiler.common.jvm/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt rename to core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt