From 7497391497a8d1c5d322343a5887a09851721054 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 1 Jul 2014 14:46:38 +0200 Subject: [PATCH] Prepare for upgrade to Gradle 2.0 MergePlugin now uses syntax appropriate for Gradle 2.0. Issue: SPR-11934 --- .../org/springframework/build/gradle/MergePlugin.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ab4a0d3cda..426b5aabfe 100644 --- a/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy +++ b/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy @@ -71,8 +71,8 @@ class MergePlugin implements Plugin { Configuration runtimeMerge = project.configurations.create("runtimeMerge") // Ensure the IDE can reference merged projects - project.eclipse.classpath.plusConfigurations += [runtimeMerge] - project.idea.module.scopes.PROVIDED.plus += runtimeMerge + project.eclipse.classpath.plusConfigurations += [ runtimeMerge ] + project.idea.module.scopes.PROVIDED.plus += [ runtimeMerge ] // Hook to perform the actual merge logic project.afterEvaluate{