From 8de5e5f1f48741f6eb9c6b566bc8415d54245677 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Fri, 11 Dec 2015 06:00:12 +0400 Subject: [PATCH] Rename. --- src/main/kotlin/com/beust/kobalt/plugin/android/AndroidFiles.kt | 2 +- .../kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidFiles.kt b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidFiles.kt index 2f6e7fee..19cda417 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidFiles.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidFiles.kt @@ -31,7 +31,7 @@ class AndroidFiles { fun explodedManifest(project: Project, mavenId: MavenId) = 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") fun classesDir(project: Project, variant: Variant): String = 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 ef799284..d975706a 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt @@ -132,7 +132,7 @@ public class AndroidPlugin @Inject constructor(val javaCompiler: JavaCompiler, } else { 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) classpathEntries.put(project.name, FileDependency(classesJar))