mirror of
https://github.com/ethauvin/kobalt.git
synced 2025-04-27 00:38:11 -07:00
Merge pull request #49 from fboldog/copy-manifest-and-resources
Copy manifest and resources
This commit is contained in:
commit
a5b180e6db
1 changed files with 2 additions and 2 deletions
|
@ -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 {
|
||||
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue