diff --git a/idea/idea-gradle-native/build.gradle.kts b/idea/idea-gradle-native/build.gradle.kts index 3e989582682..26b54f1bc6d 100644 --- a/idea/idea-gradle-native/build.gradle.kts +++ b/idea/idea-gradle-native/build.gradle.kts @@ -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")) diff --git a/idea/idea-native/build.gradle.kts b/idea/idea-native/build.gradle.kts index c227564e548..287a5b3c418 100644 --- a/idea/idea-native/build.gradle.kts +++ b/idea/idea-native/build.gradle.kts @@ -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 { diff --git a/konan/serializer/build.gradle.kts b/konan/serializer/build.gradle.kts index 074ea216add..c39c6f20fd0 100644 --- a/konan/serializer/build.gradle.kts +++ b/konan/serializer/build.gradle.kts @@ -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 { diff --git a/libraries/tools/kotlin-gradle-plugin-api/build.gradle b/libraries/tools/kotlin-gradle-plugin-api/build.gradle index 08a73272481..0c0afcac0fe 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-api/build.gradle @@ -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' diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle b/libraries/tools/kotlin-gradle-plugin/build.gradle index da3d82c2471..f69abf1a55b 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle @@ -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') diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index e6cc7b3354b..2356fc811c2 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/prepare/idea-plugin/build.gradle.kts @@ -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", diff --git a/settings.gradle b/settings.gradle index eeba9dc1fc0..f5612642517 100644 --- a/settings.gradle +++ b/settings.gradle @@ -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