Sfoglia il codice sorgente

Propagate transitivity when switching modules.

Transitivity is *very* important when we're bundling dependencies.
Without this, the IRC plugin includes all the dependencies of the
parser (including "common"), which means it ends up with its own
version of common classes and can't be called from the rest of the
client. Not having an IRC parser is... unideal. This was very
confusing, which is why the commit message is randomly 8 lines
long. But it's over now; thank you for reading.
pull/27/head
Chris Smith 9 anni fa
parent
commit
e251e481ed
1 ha cambiato i file con 2 aggiunte e 2 eliminazioni
  1. 2
    2
      local-dependency-change.gradle

+ 2
- 2
local-dependency-change.gradle Vedi File

@@ -10,7 +10,7 @@ gradle.projectsEvaluated {
10 10
             conf.dependencies.each { dep ->
11 11
                 if (dep.group =~ '^com.dmdirc' && dep.version == '+' && projectMap[dep.name] != null) {
12 12
                     remove += dep
13
-                    replace += [conf: conf.name, dep: dep]
13
+                    replace += [conf: conf.name, dep: dep, transitive: dep.transitive]
14 14
                 }
15 15
             }
16 16
 
@@ -18,7 +18,7 @@ gradle.projectsEvaluated {
18 18
         }
19 19
 
20 20
         replace.each { rep ->
21
-            p.dependencies.add(rep.conf, projectMap[rep.dep.name])
21
+            p.dependencies.add(rep.conf, projectMap[rep.dep.name], { transitive rep.transitive })
22 22
         }
23 23
     }
24 24
 }

Loading…
Annulla
Salva