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

[samples] Fix copying the calculator sample into a bundle

Browse Source
This commit is contained in:
Ilya Matveev
2018-04-03 16:12:19 +07:00
committed by ilmat192
parent 22e0827016
commit bd506c527a
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+5 -9
View File
@@ -352,10 +352,8 @@ task bundle(type: (isWindows()) ? Zip : Tar) {
include 'GRADLE_PLUGIN.md' include 'GRADLE_PLUGIN.md'
include 'PLATFORM_LIBS.md' include 'PLATFORM_LIBS.md'
include 'samples/**' include 'samples/**'
exclude 'samples/gradle.properties' exclude '**/gradle.properties'
exclude 'samples/settings.gradle' exclude '**/settings.gradle'
exclude 'samples/androidNativeActivity/settings.gradle'
exclude 'samples/androidNativeActivity/gradle.properties'
exclude '**/build' exclude '**/build'
exclude '**/.gradle' exclude '**/.gradle'
exclude 'samples/**/*.kt.bc-build' exclude 'samples/**/*.kt.bc-build'
@@ -363,19 +361,17 @@ task bundle(type: (isWindows()) ? Zip : Tar) {
} }
from(project.file("samples")) { from(project.file("samples")) {
include 'settings.gradle' include '**/settings.gradle'
include 'androidNativeActivity/settings.gradle'
into "$baseName/samples" into "$baseName/samples"
filter { it.startsWith("includeBuild") ? null : it } filter { it.startsWith("includeBuild") ? null : it }
} }
from(project.file("samples")) { from(project.file("samples")) {
include 'gradle.properties' include '**/gradle.properties'
include 'androidNativeActivity/gradle.properties'
into "$baseName/samples" into "$baseName/samples"
filter { filter {
if (it.startsWith("konan.home=")) { if (it.startsWith("konan.home=")) {
return "konan.home=../.." return it.replace("/dist", "")
} }
if (it.startsWith("konan.plugin.version=")) { if (it.startsWith("konan.plugin.version=")) {
return "konan.plugin.version=$konanVersion" return "konan.plugin.version=$konanVersion"