Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 07b7553

Browse filesBrowse files
committed
Fix MergePlugin
The submitted pull requests for SPR-10572 did not build. This commit fixes the MergePlugin to create from configurations rather than the project. It also removes unnecessarily added code that was commented out. Issue: SPR-10572
1 parent bf205bf commit 07b7553
Copy full SHA for 07b7553

File tree

Expand file treeCollapse file tree

1 file changed

+1
-8
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+1
-8
lines changed
Open diff view settings
Collapse file

‎buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy‎

Copy file name to clipboardExpand all lines: buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy
+1-8Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class MergePlugin implements Plugin<Project> {
121121
project.configurations.each { configuration ->
122122
Conf2ScopeMapping mapping = project.conf2ScopeMappings.getMapping([configuration])
123123
if(mapping.scope) {
124-
Configuration intoConfiguration = project.merge.into.create(
124+
Configuration intoConfiguration = project.merge.into.configurations.create(
125125
project.name + "-" + configuration.name)
126126
configuration.excludeRules.each {
127127
configuration.exclude([
@@ -153,13 +153,6 @@ class MergePlugin implements Plugin<Project> {
153153
}
154154
});
155155
}
156-
157-
// private Configuration createConfiguration(Project project, String name) {
158-
// if (project.configurations.respondsTo('create', String)) {
159-
// return project.configurations.create(name)
160-
// }
161-
// project.configurations.add(name)
162-
// }
163156
}
164157

165158
class MergeModel {

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.