From e1122bb8e3124d9ba2a3795963f5ef8161d59110 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Thu, 5 Nov 2015 17:35:31 -0800 Subject: [PATCH] dx fix for Windows. --- .../kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt index 5df7a7af..df54198b 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt @@ -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()