ソースを参照

Merge pull request #9 from csmith/fix-dependencies

Fix the dependency-switheroo script.
pull/10/head
Greg Holmes 9年前
コミット
f9e98c28c5
1個のファイルの変更4行の追加5行の削除
  1. 4
    5
      local-dependency-change.gradle

+ 4
- 5
local-dependency-change.gradle ファイルの表示

@@ -6,19 +6,18 @@ gradle.projectsEvaluated {
6 6
         def replace = []
7 7
 
8 8
         p.configurations.each { conf ->
9
+            def remove = []
9 10
             conf.dependencies.each { dep ->
10 11
                 if (dep.group == 'com.dmdirc' && dep.version == '+' && projectMap[dep.name] != null) {
12
+                    remove += dep
11 13
                     replace += [conf: conf.name, dep: dep]
12 14
                 }
13 15
             }
16
+
17
+            conf.dependencies.removeAll(remove)
14 18
         }
15 19
 
16 20
         replace.each { rep ->
17
-            logger.info("Replacing ${p.name}'s dependency on $rep.dep.name with project reference")
18
-            p.configurations.all*.exclude(group: 'com.dmdirc', module: rep.dep.name)
19
-            rep.dep.properties.excludeRules.each { ex ->
20
-                p.configurations.all*.exclude(group: ex.group, module: ex.module)
21
-            }
22 21
             p.dependencies.add(rep.conf, projectMap[rep.dep.name])
23 22
         }
24 23
     }

読み込み中…
キャンセル
保存