Skip to content

Commit

Permalink
Fixed bug for android gradle version 1.1.2 where bootClasspath is now…
Browse files Browse the repository at this point in the history
… private for plugins, see https://youtrack.jetbrains.com/issue/KT-6729 for more details
  • Loading branch information
kennyjoseph committed Mar 6, 2015
1 parent c439017 commit 0f39580
Showing 1 changed file with 14 additions and 7 deletions.
21 changes: 14 additions & 7 deletions src/main/groovy/org/robobinding/plugin/AndroidAspectJPlugin.groovy
Expand Up @@ -8,6 +8,7 @@ import org.gradle.api.artifacts.ConfigurationContainer;
import org.gradle.api.plugins.PluginContainer
import org.gradle.api.tasks.compile.JavaCompile

import com.android.build.gradle.BaseExtension
import com.android.build.gradle.AppPlugin
import com.android.build.gradle.LibraryPlugin
import com.android.build.gradle.api.BaseVariant
Expand Down Expand Up @@ -39,18 +40,24 @@ class AndroidAspectJPlugin implements Plugin<Project> {
project.afterEvaluate {
variants.all { variant ->
helper.createAspectJCompileTask(variant.name, variant.javaCompile,
variant.javaCompile.source, evaluateAndroidBootClasspath(plugin))
variant.javaCompile.source, evaluateAndroidBootClasspath(plugin,project))
}
}
}

private String evaluateAndroidBootClasspath(Plugin<?> plugin) {
private String evaluateAndroidBootClasspath(Plugin<?> basePlugin, Project project) {
List<String> bootClasspath
if (plugin.properties['runtimeJarList']) {
bootClasspath = plugin.runtimeJarList
} else {
bootClasspath = plugin.bootClasspath
}
BaseExtension baseExtension = project.getExtensions().getByName("android") as BaseExtension

if (basePlugin.getMetaClass().getMetaMethod("getRuntimeJarList")) {
bootClasspath = basePlugin.getRuntimeJarList()
}
else if (baseExtension.getMetaClass().getMetaMethod("getBootClasspath")) {
bootClasspath = baseExtension.getBootClasspath()
}
else {
bootClasspath= basePlugin.getBootClasspath()
}

return bootClasspath.join(File.pathSeparator)
}
Expand Down

0 comments on commit 0f39580

Please sign in to comment.