Rename :kotlin-native:kotlin-native-library-reader to :native:frontend.native

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"))

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())

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"))
 

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"))
 

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") }
 }

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"))

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())

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"))

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"))

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"))

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"))

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"))

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",

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