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

Bogus directory.

Browse source
This commit is contained in:
Cedric Beust 2015-12-22 21:43:24 +04:00
parent b3705eca80
commit 9dbeb8f14f
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -108,8 +108,7 @@ public class AndroidPlugin @Inject constructor(val javaCompiler: JavaCompiler,
runBefore = arrayOf("compile"), runAfter = arrayOf("clean"))
fun taskGenerateRFile(project: Project): TaskResult {
val resDir = "temporaryBogusResDir"
val aarDependencies = explodeAarFiles(project, File(resDir))
val aarDependencies = explodeAarFiles(project)
preDexFiles.addAll(preDex(project, context.variant, aarDependencies))
val rDirectory = KFiles.joinAndMakeDir(KFiles.generatedSourceDir(project, context.variant, "r"))
extraSourceDirectories.add(File(rDirectory))
@ -163,7 +162,7 @@ public class AndroidPlugin @Inject constructor(val javaCompiler: JavaCompiler,
* Extract all the .aar files found in the dependencies and add their android.jar to classpathEntries,
* which will be added to the classpath at compile time via the classpath interceptor.
*/
private fun explodeAarFiles(project: Project, resDir: File) : List<File> {
private fun explodeAarFiles(project: Project) : List<File> {
log(2, "Exploding aars")
val result = arrayListOf<File>()
project.compileDependencies.filter {
@ -174,9 +173,6 @@ public class AndroidPlugin @Inject constructor(val javaCompiler: JavaCompiler,
if (!File(AndroidFiles.explodedManifest(project, mavenId)).exists()) {
log(2, " Exploding ${it.jarFile.get()} to $destDir")
JarUtils.extractJarFile(it.jarFile.get(), destDir)
// Copy all the resources from this aar into the same intermediate directory
KFiles.copyRecursively(destDir.resolve("res"), resDir)
} else {
log(2, " $destDir already exists, not extracting again")
}