[build] Fix gradle plugin shadowJar building and uploading

This commit is contained in:
Ilya Matveev
2017-12-29 20:18:14 +07:00
committed by ilmat192
parent 1f74f4dc6d
commit 815f887465
2 changed files with 15 additions and 2 deletions
+3 -1
View File
@@ -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)
}
} }
+12 -1
View File
@@ -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"))