[build] Fix gradle plugin shadowJar building and uploading
This commit is contained in:
@@ -10,5 +10,7 @@ file("$rootDir/gradle.properties").withReader {
|
|||||||
rootProperties.load(it)
|
rootProperties.load(it)
|
||||||
}
|
}
|
||||||
rootProperties.each { k, v ->
|
rootProperties.each { k, v ->
|
||||||
ext.set(k, v)
|
if (!project.hasProperty(k)) {
|
||||||
|
ext.set(k, v)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -67,12 +67,18 @@ task pluginMetadata {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
configurations {
|
||||||
|
bundleDependencies {
|
||||||
|
transitive = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile 'org.jetbrains.kotlin:kotlin-native-shared'
|
compile 'org.jetbrains.kotlin:kotlin-native-shared'
|
||||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
|
compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
|
||||||
compile gradleApi()
|
compile gradleApi()
|
||||||
|
|
||||||
shadow "org.jetbrains.kotlin:kotlin-native-shared"
|
bundleDependencies 'org.jetbrains.kotlin:kotlin-native-shared'
|
||||||
|
|
||||||
testCompile gradleTestKit()
|
testCompile gradleTestKit()
|
||||||
testCompile 'junit:junit:4.12'
|
testCompile 'junit:junit:4.12'
|
||||||
@@ -82,6 +88,11 @@ dependencies {
|
|||||||
testRuntime files(pluginMetadata)
|
testRuntime files(pluginMetadata)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
shadowJar {
|
||||||
|
configurations = [project.configurations.bundleDependencies]
|
||||||
|
classifier = null
|
||||||
|
}
|
||||||
|
|
||||||
test {
|
test {
|
||||||
if (project.hasProperty("konan.home")) {
|
if (project.hasProperty("konan.home")) {
|
||||||
systemProperty("konan.home", project.property("konan.home"))
|
systemProperty("konan.home", project.property("konan.home"))
|
||||||
|
|||||||
Reference in New Issue
Block a user