azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[build][platform] adoption recent changes in konan interop plugin

Browse Source
This commit is contained in:
Vasily Levchenko
2017-09-14 12:38:45 +03:00
committed by Vasily Levchenko
parent 61ec2bfed7
commit dd7ddbcc24
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+1 -1
View File
@@ -273,7 +273,7 @@ targetList.each { target ->
suffix = 'bat' suffix = 'bat'
task(taskName, type:GradleBuild) { task(taskName, type:GradleBuild) {
dependsOn ':tools:kotlin-native-gradle-plugin:jar' dependsOn ':tools:kotlin-native-gradle-plugin:jar'
tasks = ['clean', 'compileKonan', 'klibInstall'] tasks = ['clean', 'klibInstall']
buildFile project('klib').file('platform.gradle') buildFile project('klib').file('platform.gradle')
dir project(':klib').projectDir dir project(':klib').projectDir
startParameter.projectProperties = [ startParameter.projectProperties = [
klib/platform.gradle
+2 -2
View File
@@ -22,10 +22,10 @@ def suffix = gradle.startParameter.projectProperties['suffix']
def klibProgram = suffix?"${gradle.startParameter.projectProperties['konan.home']}/bin/klib.$suffix" : "${gradle.startParameter.projectProperties['konan.home']}/bin/klib" def klibProgram = suffix?"${gradle.startParameter.projectProperties['konan.home']}/bin/klib.$suffix" : "${gradle.startParameter.projectProperties['konan.home']}/bin/klib"
task klibInstall(type:Exec) { task klibInstall(type:Exec) {
dependsOn compileKonan dependsOn konanInterop["$taskName"].interopProcessingTask
commandLine klibProgram, commandLine klibProgram,
'install', 'install',
project.file("build/konan/interopCompiledStubs/${taskName}InteropStubs/${taskName}InteropStubs.klib"), konanInterop["$taskName"].interopProcessingTask.kLib,
'-repository', '-repository',
gradle.startParameter.projectProperties['konan.home'] gradle.startParameter.projectProperties['konan.home']
} }