From 8e8077626a0192439b02ca8db7b5fe03937cccf2 Mon Sep 17 00:00:00 2001 From: Ferenc Boldog Date: Tue, 24 Nov 2015 01:35:28 +0100 Subject: [PATCH 1/2] copy AndroidManifest.xml to correct path --- src/main/kotlin/com/beust/kobalt/plugin/android/Merger.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/com/beust/kobalt/plugin/android/Merger.kt b/src/main/kotlin/com/beust/kobalt/plugin/android/Merger.kt index b64ef0b4..f4135d57 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/android/Merger.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/android/Merger.kt @@ -34,7 +34,7 @@ class Merger @Inject constructor() { private fun mergeAndroidManifest(project: Project, variant: Variant) { val dest = AndroidFiles.mergedManifest(project, variant) log(2, "----- Merging manifest (not implemented, copying it to $dest)") - KFiles.copy(Paths.get("src/main/AndroidManifest.xml"), Paths.get(dest)) + KFiles.copy(Paths.get(project.directory, "src/main/AndroidManifest.xml"), Paths.get(dest)) } interface IFileMerger { From 45e0017a0e549c918a2d2328ee55861bf0ed90a0 Mon Sep 17 00:00:00 2001 From: Ferenc Boldog Date: Tue, 24 Nov 2015 01:35:43 +0100 Subject: [PATCH 2/2] copy resources to correct path --- src/main/kotlin/com/beust/kobalt/plugin/android/Merger.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/com/beust/kobalt/plugin/android/Merger.kt b/src/main/kotlin/com/beust/kobalt/plugin/android/Merger.kt index f4135d57..d0b8e6b6 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/android/Merger.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/android/Merger.kt @@ -115,7 +115,7 @@ class Merger @Inject constructor() { listOf(variant.buildType.name, variant.productFlavor.name, "main").forEach { log(2, " Current variant: $it") - val fromDir = File("src/$it/res") + val fromDir = File(project.directory, "src/$it/res") KFiles.findRecursively(fromDir).forEach { val fromFile = File(fromDir, it) val toFile = File(dest, it)