[build] Fix 'shared' jar copying

This commit is contained in:
Ilya Matveev
2017-12-30 01:09:01 +07:00
committed by ilmat192
parent 815f887465
commit 32972af5bd
6 changed files with 16 additions and 6 deletions
+1 -1
View File
@@ -27,5 +27,5 @@ dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
compile "org.jetbrains.kotlin:kotlin-compiler:$buildKotlinVersion"
compile project(':Interop:Indexer')
compile 'org.jetbrains.kotlin:kotlin-native-shared'
compile "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
}
+2 -2
View File
@@ -147,10 +147,10 @@ dependencies {
compilerCompile kotlinCompilerModule
compilerCompile kotlinNativeInterop['llvm'].configuration
compilerCompile kotlinNativeInterop['hash'].configuration
compilerCompile 'org.jetbrains.kotlin:kotlin-native-shared'
compilerCompile "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
cli_bcCompile "org.jetbrains.kotlin:kotlin-runtime:$buildKotlinVersion"
cli_bcCompile 'org.jetbrains.kotlin:kotlin-native-shared'
cli_bcCompile "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
cli_bcCompile sourceSets.compiler.output
bc_frontendCompile kotlinCompilerModule
+1 -1
View File
@@ -4,7 +4,7 @@ apply plugin: 'kotlin'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
compile project(path: ':backend.native', configuration: 'cli_bc')
compile 'org.jetbrains.kotlin:kotlin-native-shared'
compile "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
compile 'junit:junit:4.12'
}
+6
View File
@@ -412,3 +412,9 @@ task clean {
delete bundle.outputs.files
}
}
// Don't run with other tasks (e.g. ./gradlew cleanAll bundle)
task cleanAll {
dependsOn gradle.includedBuilds.collect { it.task(":clean") }
dependsOn project.getTasksByName("clean", true)
}
+4
View File
@@ -33,6 +33,10 @@ repositories {
}
}
jar {
archiveName = "shared.jar"
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
}
@@ -74,11 +74,11 @@ configurations {
}
dependencies {
compile 'org.jetbrains.kotlin:kotlin-native-shared'
compile "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
compile gradleApi()
bundleDependencies 'org.jetbrains.kotlin:kotlin-native-shared'
bundleDependencies "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
testCompile gradleTestKit()
testCompile 'junit:junit:4.12'