|
@@ -3,22 +3,15 @@ gradle.projectsEvaluated {
|
3
|
3
|
allprojects.each { p -> projectMap[p.name] = p }
|
4
|
4
|
|
5
|
5
|
allprojects.each { p ->
|
6
|
|
- def replace = []
|
7
|
|
-
|
8
|
|
- p.configurations.each { conf ->
|
9
|
|
- def remove = []
|
10
|
|
- conf.dependencies.each { dep ->
|
11
|
|
- if (dep.group =~ '^com.dmdirc' && dep.version == '+' && projectMap[dep.name] != null) {
|
12
|
|
- remove += dep
|
13
|
|
- replace += [conf: conf.name, dep: dep, transitive: dep.transitive]
|
|
6
|
+ p.configurations.all {
|
|
7
|
+ resolutionStrategy.dependencySubstitution.all { DependencySubstitution dependency ->
|
|
8
|
+ if (dependency.requested instanceof ModuleComponentSelector && dependency.requested.group =~ '^com.dmdirc') {
|
|
9
|
+ def targetProject = projectMap[dependency.requested.module]
|
|
10
|
+ if (targetProject != null) {
|
|
11
|
+ dependency.useTarget targetProject
|
|
12
|
+ }
|
14
|
13
|
}
|
15
|
14
|
}
|
16
|
|
-
|
17
|
|
- conf.dependencies.removeAll(remove)
|
18
|
|
- }
|
19
|
|
-
|
20
|
|
- replace.each { rep ->
|
21
|
|
- p.dependencies.add(rep.conf, projectMap[rep.dep.name], { transitive rep.transitive })
|
22
|
15
|
}
|
23
|
16
|
}
|
24
|
17
|
}
|