erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-25 07:57:12 -07:00
Code Releases Activity

Fix variantless builds.

Browse source
This commit is contained in:
Cedric Beust 2015-11-26 22:08:46 -08:00
parent 0837592d4b
commit 6cd1a1d610
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/kotlin/com/beust/kobalt/Variant.kt
View file

@ -68,7 +68,7 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null,
return result
}
val shortArchiveName = productFlavor.name + "-" + buildType.name
val shortArchiveName = if (isDefault) "" else "-" + productFlavor.name + "-" + buildType.name
var generatedSourceDirectory: File? = null

4
src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt
View file

@ -104,10 +104,10 @@ public class AndroidPlugin @Inject constructor(val javaCompiler: JavaCompiler, v
private fun adb(project: Project) = "${androidHome(project)}/platform-tools/adb"
private fun temporaryApk(project: Project, flavor: String)
= KFiles.joinFileAndMakeDir(AndroidFiles.intermediates(project), "res", "resources-$flavor.ap_")
= KFiles.joinFileAndMakeDir(AndroidFiles.intermediates(project), "res", "resources$flavor.ap_")
private fun apk(project: Project, flavor: String)
= KFiles.joinFileAndMakeDir(project.buildDirectory, "outputs", "apk", "app-$flavor.apk")
= KFiles.joinFileAndMakeDir(project.buildDirectory, "outputs", "apk", "${project.name}$flavor.apk")
@Task(name = "generateR", description = "Generate the R.java file",
runBefore = arrayOf("compile"), runAfter = arrayOf("clean"))