[build] Specify group and version in 'shared' project
This commit is contained in:
+3
-3
@@ -151,7 +151,7 @@ class PlatformInfo {
|
|||||||
}
|
}
|
||||||
|
|
||||||
task sharedJar {
|
task sharedJar {
|
||||||
dependsOn gradle.includedBuild('shared').task(':jar')
|
dependsOn gradle.includedBuild('kotlin-native-shared').task(':jar')
|
||||||
}
|
}
|
||||||
|
|
||||||
task gradlePluginJar {
|
task gradlePluginJar {
|
||||||
@@ -227,7 +227,7 @@ task distCompiler(type: Copy) {
|
|||||||
into('konan/lib')
|
into('konan/lib')
|
||||||
}
|
}
|
||||||
|
|
||||||
from(file("${gradle.includedBuild('shared').projectDir}/build/libs")) {
|
from(file("${gradle.includedBuild('kotlin-native-shared').projectDir}/build/libs")) {
|
||||||
into('konan/lib')
|
into('konan/lib')
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -305,7 +305,7 @@ targetList.each { target ->
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Task platformLibs = task("${target}PlatformLibs") {
|
task("${target}PlatformLibs") {
|
||||||
dependsOn ":platformLibs:${target}Install"
|
dependsOn ":platformLibs:${target}Install"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ include ':uikit'
|
|||||||
include ':win32'
|
include ':win32'
|
||||||
include ':videoplayer'
|
include ':videoplayer'
|
||||||
include ':workers'
|
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'
|
includeBuild '../tools/kotlin-native-gradle-plugin'
|
||||||
|
|
||||||
|
|||||||
+1
-5
@@ -31,8 +31,4 @@ include ':performance'
|
|||||||
include ':platformLibs'
|
include ':platformLibs'
|
||||||
|
|
||||||
includeBuild 'tools/kotlin-native-gradle-plugin'
|
includeBuild 'tools/kotlin-native-gradle-plugin'
|
||||||
includeBuild('shared') {
|
includeBuild 'shared'
|
||||||
dependencySubstitution {
|
|
||||||
substitute module('org.jetbrains.kotlin:kotlin-native-shared') with project(':')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -23,6 +23,9 @@ buildscript {
|
|||||||
|
|
||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
|
|
||||||
|
group = 'org.jetbrains.kotlin'
|
||||||
|
version = konanVersion
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven {
|
maven {
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
rootProject.name = "shared"
|
rootProject.name = "kotlin-native-shared"
|
||||||
Reference in New Issue
Block a user