From bd506c527a5ecb60b7e1e524571590a794b250e6 Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Tue, 3 Apr 2018 16:12:19 +0700
Subject: [PATCH] [samples] Fix copying the calculator sample into a bundle

---
 build.gradle | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 235664bcd72..58564fb49b1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -352,10 +352,8 @@ task bundle(type: (isWindows()) ? Zip : Tar) {
         include 'GRADLE_PLUGIN.md'
         include 'PLATFORM_LIBS.md'
         include 'samples/**'
-        exclude 'samples/gradle.properties'
-        exclude 'samples/settings.gradle'
-        exclude 'samples/androidNativeActivity/settings.gradle'
-        exclude 'samples/androidNativeActivity/gradle.properties'
+        exclude '**/gradle.properties'
+        exclude '**/settings.gradle'
         exclude '**/build'
         exclude '**/.gradle'
         exclude 'samples/**/*.kt.bc-build'
@@ -363,19 +361,17 @@ task bundle(type: (isWindows()) ? Zip : Tar) {
     }
 
     from(project.file("samples")) {
-        include 'settings.gradle'
-        include 'androidNativeActivity/settings.gradle'
+        include '**/settings.gradle'
         into "$baseName/samples"
         filter { it.startsWith("includeBuild") ? null : it }
     }
 
     from(project.file("samples")) {
-        include 'gradle.properties'
-        include 'androidNativeActivity/gradle.properties'
+        include '**/gradle.properties'
         into "$baseName/samples"
         filter {
             if (it.startsWith("konan.home=")) {
-                return "konan.home=../.."
+                return it.replace("/dist", "")
             }
             if (it.startsWith("konan.plugin.version=")) {
                 return "konan.plugin.version=$konanVersion"