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

Pass all the class files to dx.

Browse source
This commit is contained in:
Cedric Beust 2015-11-10 02:37:40 -08:00
parent 90908bd072
commit c59a4cd4f3
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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_