root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Upgradle to gradle 1.6

This commit is contained in:
Phillip Webb 2013-07-30 13:29:05 -07:00
parent 98da5a7b2b
commit 22454c8edf
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/groovy/org/springframework/build/gradle/DetectSplitPackagesPlugin.groovy
View File

@ -49,7 +49,7 @@ import org.gradle.api.tasks.TaskAction
public class DetectSplitPackagesPlugin implements Plugin<Project> { public class DetectSplitPackagesPlugin implements Plugin<Project> {
public void apply(Project project) { public void apply(Project project) {
def tasks = project.tasks def tasks = project.tasks
Task detectSplitPackages = tasks.add("detectSplitPackages", DetectSplitPackagesTask.class) Task detectSplitPackages = tasks.create("detectSplitPackages", DetectSplitPackagesTask.class)
if (tasks.asMap.containsKey("check")) { if (tasks.asMap.containsKey("check")) {
tasks.getByName("check").dependsOn detectSplitPackages tasks.getByName("check").dependsOn detectSplitPackages
} }

6
buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy
View File

@ -67,8 +67,8 @@ class MergePlugin implements Plugin<Project> {
project.plugins.apply(IdeaPlugin) project.plugins.apply(IdeaPlugin)
MergeModel model = project.extensions.create("merge", MergeModel) MergeModel model = project.extensions.create("merge", MergeModel)
project.configurations.add("merging") project.configurations.create("merging")
Configuration runtimeMerge = project.configurations.add("runtimeMerge") Configuration runtimeMerge = project.configurations.create("runtimeMerge")
// Ensure the IDE can reference merged projects // Ensure the IDE can reference merged projects
project.eclipse.classpath.plusConfigurations += [runtimeMerge] project.eclipse.classpath.plusConfigurations += [runtimeMerge]
@ -121,7 +121,7 @@ class MergePlugin implements Plugin<Project> {
project.configurations.each { configuration -> project.configurations.each { configuration ->
Conf2ScopeMapping mapping = project.conf2ScopeMappings.getMapping([configuration]) Conf2ScopeMapping mapping = project.conf2ScopeMappings.getMapping([configuration])
if(mapping.scope) { if(mapping.scope) {
Configuration intoConfiguration = project.merge.into.configurations.add( Configuration intoConfiguration = project.merge.into.configurations.create(
project.name + "-" + configuration.name) project.name + "-" + configuration.name)
configuration.excludeRules.each { configuration.excludeRules.each {
configuration.exclude([ configuration.exclude([

2
spring-aspects/aspects.gradle
View File

@ -61,7 +61,7 @@ compileTestJava {
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: compileJava.sourceCompatibility, target: compileJava.targetCompatibility, ant.iajc(source: sourceCompatibility, target: 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,