From c59a4cd4f301b5d8d4951de78f0e987a65ccaa62 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Tue, 10 Nov 2015 02:37:40 -0800 Subject: [PATCH] Pass all the class files to dx. --- .../com/beust/kobalt/plugin/android/AndroidPlugin.kt | 9 ++++++++- 1 file changed, 8 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 29fbd209..062a4450 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt @@ -233,7 +233,14 @@ public class AndroidPlugin @Inject constructor(val javaCompiler: JavaCompiler) val classesDex = "classes.dex" val outClassesDex = KFiles.joinDir(classesDexDir, classesDex) - RunCommand(dx).run(listOf("--dex", "--output", outClassesDex, buildDir!!.toString())) + val args = listOf("--dex", "--output", outClassesDex) + val otherArgs = + project.dependencies?.let { + it.dependencies.map { + it.jarFile.get().path + }.filter { ! it.endsWith(".aar") && ! it.endsWith("android.jar") } + } ?: emptyList() + RunCommand(dx).run(args + otherArgs) // // Add classes.dex to existing .ap_