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

dx fix for Windows.

Browse source
This commit is contained in:
Cedric Beust 2015-11-05 17:35:31 -08:00
parent 1b27baf05f
commit e1122bb8e3
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -198,7 +198,8 @@ public class AndroidPlugin @Inject constructor(val javaCompiler: JavaCompiler) :
// Call dx to generate classes.dex
//
val buildToolsDir = buildToolsVersion(project)
val dx = "${androidHome(project)}/build-tools/$buildToolsDir/dx"
val dx = "${androidHome(project)}/build-tools/$buildToolsDir/dx" +
if (OperatingSystem.current().isWindows()) ".bat" else ""
val buildDir = context.pluginProperties.get("java", JvmCompilerPlugin.BUILD_DIR)
val libsDir = (context.pluginProperties.get("packaging", PackagingPlugin.LIBS_DIR) as File).path
File(libsDir.toString()).mkdirs()