From 2a9eaab6741055f05895985e3461ec26227dec8e Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sat, 31 Mar 2018 23:32:20 +0200 Subject: [PATCH] Remove outdated declarations from spring-aspects build --- spring-aspects/aspects.gradle | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/spring-aspects/aspects.gradle b/spring-aspects/aspects.gradle index 2c68dff4da9..78491cc0bda 100644 --- a/spring-aspects/aspects.gradle +++ b/spring-aspects/aspects.gradle @@ -1,5 +1,4 @@ -// redefine the compileJava and compileTestJava tasks in order to -// compile sources with ajc instead of javac +// Redefine the compileJava and compileTestJava tasks in order to compile sources with ajc instead of javac configurations { rt @@ -8,22 +7,14 @@ configurations { ajInpath } -// exclude spring-aspects as a module within IDEA until IDEA-64446 is resolved -tasks.getByName("idea").onlyIf { false } -tasks.getByName("ideaModule").onlyIf { false } - compileJava { actions = [] dependsOn configurations.ajc.getTaskDependencyFromProjectDependency(true, "compileJava") def outputDir = project.sourceSets.main.output.classesDir - inputs.files(project.sourceSets.main.allSource + project.sourceSets.main.compileClasspath) outputs.dir outputDir - ext.sourceCompatibility = project(":spring-core").compileJava.sourceCompatibility - ext.targetCompatibility = project(":spring-core").compileJava.targetCompatibility - doLast{ // Assemble runtime classpath from folders and JARs that actually exist def runtimeClasspath = project.files(sourceSets.main.runtimeClasspath.files.findAll({ it.exists() })) @@ -53,13 +44,9 @@ compileTestJava { dependsOn jar def outputDir = project.sourceSets.test.output.classesDir - inputs.files(project.sourceSets.test.allSource + project.sourceSets.test.compileClasspath) outputs.dir outputDir - ext.sourceCompatibility = project(":spring-core").compileTestJava.sourceCompatibility - ext.targetCompatibility = project(":spring-core").compileTestJava.targetCompatibility - doLast{ // Assemble runtime classpath from folders and JARs that actually exist def runtimeClasspath = project.files(sourceSets.test.runtimeClasspath.files.findAll({ it.exists() }))