From b49e6ac58111e165e381abeb6355f03f09ae1031 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Tue, 28 Jan 2020 13:54:17 +0700 Subject: [PATCH] Rename :kotlin-native:kotlin-native-library-reader to :native:frontend.native --- idea/build.gradle.kts | 2 +- idea/idea-android/build.gradle.kts | 2 +- idea/idea-gradle-native/build.gradle.kts | 2 -- idea/idea-gradle/build.gradle.kts | 2 +- idea/idea-jps-common/build.gradle.kts | 2 +- idea/idea-maven/build.gradle.kts | 2 +- idea/idea-native/build.gradle.kts | 5 +++-- idea/jvm-debugger/jvm-debugger-test/build.gradle.kts | 2 +- j2k/build.gradle.kts | 2 +- konan/commonizer/build.gradle.kts | 2 +- {konan/library-reader => native/frontend}/build.gradle.kts | 0 .../src/org/jetbrains/kotlin/builtins/konan/KonanBuiltIns.kt | 0 .../resolve/konan/platform/NativePlatformAnalyzerServices.kt | 0 .../resolve/konan/platform/NativePlatformConfigurator.kt | 0 .../android-extensions-idea/build.gradle.kts | 2 +- plugins/uast-kotlin/build.gradle.kts | 2 +- prepare/idea-plugin/build.gradle.kts | 2 +- settings.gradle | 4 ++-- 18 files changed, 16 insertions(+), 17 deletions(-) rename {konan/library-reader => native/frontend}/build.gradle.kts (100%) rename {konan/library-reader => native/frontend}/src/org/jetbrains/kotlin/builtins/konan/KonanBuiltIns.kt (100%) rename {konan/library-reader => native/frontend}/src/org/jetbrains/kotlin/resolve/konan/platform/NativePlatformAnalyzerServices.kt (100%) rename {konan/library-reader => native/frontend}/src/org/jetbrains/kotlin/resolve/konan/platform/NativePlatformConfigurator.kt (100%) diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index 7066ddd15e6..dc9f1b69540 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -128,7 +128,7 @@ dependencies { testCompile(commonDep("junit:junit")) testCompileOnly(intellijPluginDep("coverage")) - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } + testRuntime(project(":native:frontend.native")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } testRuntime(commonDep("org.jetbrains", "markdown")) diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts index 4070fbf7e54..95dbe36df57 100644 --- a/idea/idea-android/build.gradle.kts +++ b/idea/idea-android/build.gradle.kts @@ -35,7 +35,7 @@ dependencies { testCompile(project(":idea:idea-native")) { isTransitive = false } testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } + testRuntime(project(":native:frontend.native")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } testCompile(intellijDep()) diff --git a/idea/idea-gradle-native/build.gradle.kts b/idea/idea-gradle-native/build.gradle.kts index ffa98263fc2..cc02a21a08b 100644 --- a/idea/idea-gradle-native/build.gradle.kts +++ b/idea/idea-gradle-native/build.gradle.kts @@ -6,8 +6,6 @@ plugins { dependencies { testRuntime(intellijDep()) - compile(project(":kotlin-native:kotlin-native-library-reader")) - compileOnly(project(":idea:idea-gradle")) compileOnly(project(":idea:idea-native")) diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts index 37ec5afa3c7..50761df9413 100644 --- a/idea/idea-gradle/build.gradle.kts +++ b/idea/idea-gradle/build.gradle.kts @@ -49,7 +49,7 @@ dependencies { testCompile(project(":idea:idea-native")) { isTransitive = false } testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } + testRuntime(project(":native:frontend.native")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } testRuntime(project(":idea:idea-new-project-wizard")) diff --git a/idea/idea-jps-common/build.gradle.kts b/idea/idea-jps-common/build.gradle.kts index 05634b0156b..f59eca69fcd 100644 --- a/idea/idea-jps-common/build.gradle.kts +++ b/idea/idea-jps-common/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { compile(project(":compiler:cli-common")) compile(project(":compiler:frontend.java")) compile(project(":js:js.frontend")) - compile(project(":kotlin-native:kotlin-native-library-reader")) + compile(project(":native:frontend.native")) compileOnly(intellijDep()) compileOnly(jpsStandalone()) { includeJars("jps-model") } } diff --git a/idea/idea-maven/build.gradle.kts b/idea/idea-maven/build.gradle.kts index a421ac56f6e..7f22da72c7c 100644 --- a/idea/idea-maven/build.gradle.kts +++ b/idea/idea-maven/build.gradle.kts @@ -38,7 +38,7 @@ dependencies { } testCompile(project(":idea:idea-native")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } + testRuntime(project(":native:frontend.native")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } testRuntime(project(":kotlin-reflect")) diff --git a/idea/idea-native/build.gradle.kts b/idea/idea-native/build.gradle.kts index a158f1c1d71..7b4eea9f584 100644 --- a/idea/idea-native/build.gradle.kts +++ b/idea/idea-native/build.gradle.kts @@ -8,12 +8,13 @@ dependencies { compile(project(":idea:idea-core")) compile(project(":idea:idea-jvm")) compile(project(":compiler:frontend")) + compile(project(":native:frontend.native")) + compile(project(":kotlin-native:kotlin-native-utils")) + compileOnly(intellijDep()) Platform[192].orHigher { compileOnly(intellijPluginDep("java")) } - compile(project(":kotlin-native:kotlin-native-library-reader")) - compile(project(":kotlin-native:kotlin-native-utils")) testCompileOnly(intellijDep()) testRuntimeOnly(intellijDep()) diff --git a/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts index f6d32ca604e..dd6b6e5960e 100644 --- a/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts +++ b/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts @@ -32,7 +32,7 @@ dependencies { testRuntime(project(":idea:idea-jvm")) testRuntime(project(":idea:idea-native")) { isTransitive = false } testRuntime(project(":idea:idea-gradle-native")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } + testRuntime(project(":native:frontend.native")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } testRuntime(project(":kotlin-reflect")) diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts index edbae527dc3..dd1df395b60 100644 --- a/j2k/build.gradle.kts +++ b/j2k/build.gradle.kts @@ -32,7 +32,7 @@ dependencies { testCompile(project(":idea:idea-native")) { isTransitive = false } testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } + testRuntime(project(":native:frontend.native")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } testRuntime(project(":idea:idea-jvm")) diff --git a/konan/commonizer/build.gradle.kts b/konan/commonizer/build.gradle.kts index cfc3724ddf2..ece22cb183f 100644 --- a/konan/commonizer/build.gradle.kts +++ b/konan/commonizer/build.gradle.kts @@ -26,7 +26,7 @@ dependencies { compile(project(":kotlin-util-klib-metadata")) compile(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - compile(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } + compile(project(":native:frontend.native")) { isTransitive = false } testCompile(commonDep("junit:junit")) testCompile(projectTests(":compiler:tests-common")) diff --git a/konan/library-reader/build.gradle.kts b/native/frontend/build.gradle.kts similarity index 100% rename from konan/library-reader/build.gradle.kts rename to native/frontend/build.gradle.kts diff --git a/konan/library-reader/src/org/jetbrains/kotlin/builtins/konan/KonanBuiltIns.kt b/native/frontend/src/org/jetbrains/kotlin/builtins/konan/KonanBuiltIns.kt similarity index 100% rename from konan/library-reader/src/org/jetbrains/kotlin/builtins/konan/KonanBuiltIns.kt rename to native/frontend/src/org/jetbrains/kotlin/builtins/konan/KonanBuiltIns.kt diff --git a/konan/library-reader/src/org/jetbrains/kotlin/resolve/konan/platform/NativePlatformAnalyzerServices.kt b/native/frontend/src/org/jetbrains/kotlin/resolve/konan/platform/NativePlatformAnalyzerServices.kt similarity index 100% rename from konan/library-reader/src/org/jetbrains/kotlin/resolve/konan/platform/NativePlatformAnalyzerServices.kt rename to native/frontend/src/org/jetbrains/kotlin/resolve/konan/platform/NativePlatformAnalyzerServices.kt diff --git a/konan/library-reader/src/org/jetbrains/kotlin/resolve/konan/platform/NativePlatformConfigurator.kt b/native/frontend/src/org/jetbrains/kotlin/resolve/konan/platform/NativePlatformConfigurator.kt similarity index 100% rename from konan/library-reader/src/org/jetbrains/kotlin/resolve/konan/platform/NativePlatformConfigurator.kt rename to native/frontend/src/org/jetbrains/kotlin/resolve/konan/platform/NativePlatformConfigurator.kt diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts index 5ef0dcd886e..865fe36efa1 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts @@ -34,7 +34,7 @@ dependencies { testCompile(commonDep("junit:junit")) testCompile(project(":idea:idea-native")) { isTransitive = false } testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } + testRuntime(project(":native:frontend.native")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } testRuntime(project(":kotlin-reflect")) testCompile(intellijPluginDep("android")) diff --git a/plugins/uast-kotlin/build.gradle.kts b/plugins/uast-kotlin/build.gradle.kts index 78011b4e960..ff91b30efea 100644 --- a/plugins/uast-kotlin/build.gradle.kts +++ b/plugins/uast-kotlin/build.gradle.kts @@ -40,7 +40,7 @@ dependencies { testCompile(project(":idea:idea-native")) { isTransitive = false } testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } + testRuntime(project(":native:frontend.native")) { isTransitive = false } testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } testRuntime(project(":kotlin-reflect")) testRuntime(project(":idea:idea-android")) diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index 68765d18e25..d25642ae4ca 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/prepare/idea-plugin/build.gradle.kts @@ -66,7 +66,7 @@ val projectsToShadow by extra(listOf( ":js:js.serializer", ":js:js.translator", ":kotlin-native:kotlin-native-utils", - ":kotlin-native:kotlin-native-library-reader", + ":native:frontend.native", ":kotlin-gradle-statistics", ":compiler:light-classes", ":compiler:plugin-api", diff --git a/settings.gradle b/settings.gradle index 058050ad879..c0e7baa0bb7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -125,7 +125,7 @@ include ":kotlin-build-common", ":js:js.dce", ":js:js.tests", ":kotlin-native:kotlin-native-utils", - ":kotlin-native:kotlin-native-library-reader", + ":native:frontend.native", ":kotlin-native:commonizer", ":jps-plugin", ":kotlin-jps-plugin", @@ -406,7 +406,7 @@ project(':kotlin-util-io').projectDir = "$rootDir/compiler/util-io" as File project(':kotlin-util-klib').projectDir = "$rootDir/compiler/util-klib" as File project(':kotlin-util-klib-metadata').projectDir = "$rootDir/compiler/util-klib-metadata" as File project(':kotlin-native:kotlin-native-utils').projectDir = "$rootDir/konan/utils" as File -project(':kotlin-native:kotlin-native-library-reader').projectDir = "$rootDir/konan/library-reader" as File +project(':native:frontend.native').projectDir = "$rootDir/native/frontend" as File project(':kotlin-native:commonizer').projectDir = "$rootDir/konan/commonizer" as File project(':kotlin-jps-plugin').projectDir = "$rootDir/prepare/jps-plugin" as File project(':idea:idea-android-output-parser').projectDir = "$rootDir/idea/idea-android/idea-android-output-parser" as File