diff --git a/build.gradle b/build.gradle index 4b3d0e9aa8d..f40a138de13 100644 --- a/build.gradle +++ b/build.gradle @@ -151,7 +151,7 @@ class PlatformInfo { } task sharedJar { - dependsOn gradle.includedBuild('shared').task(':jar') + dependsOn gradle.includedBuild('kotlin-native-shared').task(':jar') } task gradlePluginJar { @@ -227,7 +227,7 @@ task distCompiler(type: Copy) { into('konan/lib') } - from(file("${gradle.includedBuild('shared').projectDir}/build/libs")) { + from(file("${gradle.includedBuild('kotlin-native-shared').projectDir}/build/libs")) { into('konan/lib') } @@ -305,7 +305,7 @@ targetList.each { target -> } } - Task platformLibs = task("${target}PlatformLibs") { + task("${target}PlatformLibs") { dependsOn ":platformLibs:${target}Install" } } diff --git a/samples/settings.gradle b/samples/settings.gradle index 238123439e5..5341e8ca20a 100644 --- a/samples/settings.gradle +++ b/samples/settings.gradle @@ -21,7 +21,7 @@ include ':uikit' include ':win32' include ':videoplayer' include ':workers' -// TODO: set up some rule to remove these strings in bundle -includeBuild('../shared') { dependencySubstitution { substitute module('org.jetbrains.kotlin:kotlin-native-shared') with project(':') } } + +includeBuild '../shared' includeBuild '../tools/kotlin-native-gradle-plugin' diff --git a/settings.gradle b/settings.gradle index 7dd6cf39c28..6512e5a585c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -31,8 +31,4 @@ include ':performance' include ':platformLibs' includeBuild 'tools/kotlin-native-gradle-plugin' -includeBuild('shared') { - dependencySubstitution { - substitute module('org.jetbrains.kotlin:kotlin-native-shared') with project(':') - } -} +includeBuild 'shared' diff --git a/shared/build.gradle b/shared/build.gradle index c896c918b42..55459ab7891 100644 --- a/shared/build.gradle +++ b/shared/build.gradle @@ -23,6 +23,9 @@ buildscript { apply plugin: 'kotlin' +group = 'org.jetbrains.kotlin' +version = konanVersion + repositories { mavenCentral() maven { diff --git a/shared/settings.gradle b/shared/settings.gradle index b63b95eb360..b536af31c76 100644 --- a/shared/settings.gradle +++ b/shared/settings.gradle @@ -1 +1 @@ -rootProject.name = "shared" \ No newline at end of file +rootProject.name = "kotlin-native-shared" \ No newline at end of file