From 22454c8edfa3ba2c81d410ac7543df1549460885 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 30 Jul 2013 13:29:05 -0700 Subject: [PATCH] Upgradle to gradle 1.6 --- .../build/gradle/DetectSplitPackagesPlugin.groovy | 2 +- .../org/springframework/build/gradle/MergePlugin.groovy | 6 +++--- spring-aspects/aspects.gradle | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildSrc/src/main/groovy/org/springframework/build/gradle/DetectSplitPackagesPlugin.groovy b/buildSrc/src/main/groovy/org/springframework/build/gradle/DetectSplitPackagesPlugin.groovy index ddafa956ef7..dc554fb2291 100644 --- a/buildSrc/src/main/groovy/org/springframework/build/gradle/DetectSplitPackagesPlugin.groovy +++ b/buildSrc/src/main/groovy/org/springframework/build/gradle/DetectSplitPackagesPlugin.groovy @@ -49,7 +49,7 @@ import org.gradle.api.tasks.TaskAction public class DetectSplitPackagesPlugin implements Plugin { public void apply(Project project) { def tasks = project.tasks - Task detectSplitPackages = tasks.add("detectSplitPackages", DetectSplitPackagesTask.class) + Task detectSplitPackages = tasks.create("detectSplitPackages", DetectSplitPackagesTask.class) if (tasks.asMap.containsKey("check")) { tasks.getByName("check").dependsOn detectSplitPackages } diff --git a/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy b/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy index 4143780702b..dc3d8f57aa5 100644 --- a/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy +++ b/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy @@ -67,8 +67,8 @@ class MergePlugin implements Plugin { project.plugins.apply(IdeaPlugin) MergeModel model = project.extensions.create("merge", MergeModel) - project.configurations.add("merging") - Configuration runtimeMerge = project.configurations.add("runtimeMerge") + project.configurations.create("merging") + Configuration runtimeMerge = project.configurations.create("runtimeMerge") // Ensure the IDE can reference merged projects project.eclipse.classpath.plusConfigurations += [runtimeMerge] @@ -121,7 +121,7 @@ class MergePlugin implements Plugin { project.configurations.each { configuration -> Conf2ScopeMapping mapping = project.conf2ScopeMappings.getMapping([configuration]) if(mapping.scope) { - Configuration intoConfiguration = project.merge.into.configurations.add( + Configuration intoConfiguration = project.merge.into.configurations.create( project.name + "-" + configuration.name) configuration.excludeRules.each { configuration.exclude([ diff --git a/spring-aspects/aspects.gradle b/spring-aspects/aspects.gradle index faea8f28553..59a0ae615f7 100644 --- a/spring-aspects/aspects.gradle +++ b/spring-aspects/aspects.gradle @@ -61,7 +61,7 @@ compileTestJava { ant.taskdef(resource: "org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties", classpath: configurations.ajc.asPath) - ant.iajc(source: compileJava.sourceCompatibility, target: compileJava.targetCompatibility, + ant.iajc(source: sourceCompatibility, target: targetCompatibility, maxmem: "1024m", fork: "true", Xlint: "ignore", destDir: outputDir.absolutePath, aspectPath: jar.archivePath,