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 ddafa956ef..dc554fb229 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 27afc24b7c..c7e46af1fd 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.create( project.name + "-" + configuration.name) configuration.excludeRules.each { configuration.exclude([ @@ -153,6 +153,13 @@ class MergePlugin implements Plugin { } }); } + +// private Configuration createConfiguration(Project project, String name) { +// if (project.configurations.respondsTo('create', String)) { +// return project.configurations.create(name) +// } +// project.configurations.add(name) +// } } class MergeModel {