From 9747704c8b81324d02f4a84de5802782e34fdb85 Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Tue, 20 Jun 2017 13:23:25 +0700 Subject: [PATCH] samples: Minor fixes for bundle 1. Rearrange tasks for C++ and Kotlin compilation in concurrent sample. It allows the build to download all dependencies before the compilation. 2. Don't copy *.kt.bc-build directories in the distribution archive. --- build.gradle | 1 + samples/concurrent/build.gradle | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index e8aa249eef6..27404cb81c3 100644 --- a/build.gradle +++ b/build.gradle @@ -397,6 +397,7 @@ task bundle(type: Tar) { exclude '**/settings.gradle' exclude '**/build' exclude '**/.gradle' + exclude 'samples/**/*.kt.bc-build' rename('(.*)\\.for_bundle', '$1') into baseName } diff --git a/samples/concurrent/build.gradle b/samples/concurrent/build.gradle index d2bc9c03daa..4dbb54880d2 100644 --- a/samples/concurrent/build.gradle +++ b/samples/concurrent/build.gradle @@ -14,10 +14,11 @@ konanArtifacts { } task compileCpp(type: Exec) { + dependsOn 'genMessageChannelInteropStubs' workingDir project.getProjectDir() commandLine './buildCpp.sh' } -genMessageChannelInteropStubs { - dependsOn(compileCpp) +compileKonanMessageChannel { + dependsOn 'compileCpp' } \ No newline at end of file