Rename "konan" modules to "kotlin-native" modules

This commit is contained in:
Dmitriy Dolovov
2018-09-06 12:34:03 +03:00
committed by Mikhail Glukhikh
parent 4cedbe5f39
commit 337100edc3
7 changed files with 11 additions and 13 deletions
+1 -3
View File
@@ -4,9 +4,7 @@ plugins {
}
dependencies {
compile(project(":konan:konan-serializer"))
// compile("org.jetbrains.kotlin:kotlin-native-gradle-plugin")
compile(project(":kotlin-native:kotlin-native-serializer"))
compileOnly(project(":idea:idea-gradle"))
compileOnly(project(":idea:idea-native"))
+1 -1
View File
@@ -8,7 +8,7 @@ dependencies {
compile(project(":idea:idea-jvm"))
compile(project(":compiler:frontend"))
compileOnly(intellijDep())
compile(project(":konan:konan-serializer"))
compile(project(":kotlin-native:kotlin-native-serializer"))
}
sourceSets {
+1 -1
View File
@@ -17,7 +17,7 @@ dependencies {
// This dependency is necessary to keep the right dependency record inside of POM file:
compile(projectRuntimeJar(":kotlin-compiler"))
compile(project(":konan:konan-utils"))
compile(project(":kotlin-native:kotlin-native-utils"))
}
sourceSets {
@@ -15,7 +15,7 @@ pill {
dependencies {
compile project(':kotlin-stdlib')
compile project('::konan:konan-utils')
compile project('::kotlin-native:kotlin-native-utils')
compileOnly gradleApi()
compileOnly 'com.android.tools.build:gradle:0.4.2'
@@ -38,7 +38,7 @@ dependencies {
compileOnly project(':compiler:daemon-common')
compile project(':kotlin-stdlib')
compile project(':konan:konan-utils')
compile project(':kotlin-native:kotlin-native-utils')
compileOnly project(':kotlin-reflect-api')
compileOnly project(':kotlin-android-extensions')
compileOnly project(':kotlin-build-common')
+2 -2
View File
@@ -45,8 +45,8 @@ val projectsToShadow by extra(listOf(
":js:js.frontend",
":js:js.parser",
":js:js.serializer",
":konan:konan-serializer",
":konan:konan-utils",
":kotlin-native:kotlin-native-serializer",
":kotlin-native:kotlin-native-utils",
":compiler:light-classes",
":compiler:plugin-api",
":kotlin-preloader",
+4 -4
View File
@@ -49,8 +49,8 @@ include ":kotlin-build-common",
":js:js.translator",
":js:js.dce",
":js:js.tests",
":konan:konan-utils",
":konan:konan-serializer",
":kotlin-native:kotlin-native-utils",
":kotlin-native:kotlin-native-serializer",
":jps-plugin",
":kotlin-jps-plugin",
":core:descriptors",
@@ -240,8 +240,8 @@ project(':compiler:ir.psi2ir').projectDir = "$rootDir/compiler/ir/ir.psi2ir" as
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
project(':compiler:backend.js').projectDir = "$rootDir/compiler/ir/backend.js" as File
project(':konan:konan-utils').projectDir = "$rootDir/konan/utils" as File
project(':konan:konan-serializer').projectDir = "$rootDir/konan/serializer" as File
project(':kotlin-native:kotlin-native-utils').projectDir = "$rootDir/konan/utils" as File
project(':kotlin-native:kotlin-native-serializer').projectDir = "$rootDir/konan/serializer" 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
project(':plugins:android-extensions-compiler').projectDir = "$rootDir/plugins/android-extensions/android-extensions-compiler" as File