Upgradle to gradle 1.6

This commit is contained in:
Phillip Webb 2013-07-30 10:33:03 -07:00
parent dc87a2211c
commit 1fee4c0c0b
1 changed files with 5 additions and 5 deletions

View File

@ -12,8 +12,8 @@ configurations {
tasks.getByName("idea").onlyIf { false }
tasks.getByName("ideaModule").onlyIf { false }
task compileJava(overwrite: true) {
dependsOn JavaPlugin.PROCESS_RESOURCES_TASK_NAME
compileJava {
actions = []
dependsOn configurations.ajc.getTaskDependencyFromProjectDependency(true, "compileJava")
def outputDir = project.sourceSets.main.output.classesDir
@ -44,8 +44,8 @@ task compileJava(overwrite: true) {
}
}
task compileTestJava(overwrite: true) {
dependsOn JavaPlugin.PROCESS_TEST_RESOURCES_TASK_NAME
compileTestJava {
actions = []
dependsOn configurations.ajc.getTaskDependencyFromProjectDependency(true, "compileTestJava")
dependsOn jar
@ -61,7 +61,7 @@ task compileTestJava(overwrite: true) {
ant.taskdef(resource: "org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties",
classpath: configurations.ajc.asPath)
ant.iajc(source: sourceCompatibility, target: targetCompatibility,
ant.iajc(source: compileJava.sourceCompatibility, target: compileJava.targetCompatibility,
maxmem: "1024m", fork: "true", Xlint: "ignore",
destDir: outputDir.absolutePath,
aspectPath: jar.archivePath,