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

Rename.

Browse source
This commit is contained in:
Cedric Beust 2015-12-11 06:00:12 +04:00
parent 932d45bd15
commit 8de5e5f1f4
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/kotlin/com/beust/kobalt/plugin/android/AndroidFiles.kt
View file

@ -31,7 +31,7 @@ class AndroidFiles {
fun explodedManifest(project: Project, mavenId: MavenId) = fun explodedManifest(project: Project, mavenId: MavenId) =
KFiles.joinDir(exploded(project, mavenId), "AndroidManifest.xml") KFiles.joinDir(exploded(project, mavenId), "AndroidManifest.xml")
fun classesJar(project: Project, mavenId: MavenId) = fun explodedClassesJar(project: Project, mavenId: MavenId) =
KFiles.joinDir(exploded(project, mavenId), "classes.jar") KFiles.joinDir(exploded(project, mavenId), "classes.jar")
fun classesDir(project: Project, variant: Variant): String = fun classesDir(project: Project, variant: Variant): String =

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

@ -132,7 +132,7 @@ public class AndroidPlugin @Inject constructor(val javaCompiler: JavaCompiler,
} else { } else {
log(2, "$destDir already exists, not extracting again") log(2, "$destDir already exists, not extracting again")
} }
val classesJar = AndroidFiles.classesJar(project, mavenId) val classesJar = AndroidFiles.explodedClassesJar(project, mavenId)
// Add the classses.jar of this .aar to the classpath entries (which are returned via IClasspathContributor) // Add the classses.jar of this .aar to the classpath entries (which are returned via IClasspathContributor)
classpathEntries.put(project.name, FileDependency(classesJar)) classpathEntries.put(project.name, FileDependency(classesJar))