Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgradle to gradle 1.6

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-aspects/aspects.gradle
View File

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