File tree 2 files changed +4
-0
lines changed
2 files changed +4
-0
lines changed Original file line number Diff line number Diff line change @@ -12,4 +12,6 @@ pom.xml.asc
12
12
* .sublime-workspace
13
13
.DS_Store
14
14
.cpcache
15
+ .clj-kondo
16
+ .lsp
15
17
! test_projects /mergers /project_c.jar
Original file line number Diff line number Diff line change 135
135
alias-maps (mapv (:aliases deps-map) aliases)
136
136
replace-deps-old (reduce #(merge %1 (:deps %2 )) nil alias-maps)
137
137
replace-deps (reduce #(merge %1 (:replace-deps %2 )) nil alias-maps)
138
+ override-deps (reduce #(merge %1 (:override-deps %2 )) nil alias-maps)
138
139
extra-deps (reduce #(merge %1 (:extra-deps %2 )) nil alias-maps)
139
140
replace-paths-old (reduce #(append-unique %1 (:paths %2 )) nil alias-maps)
140
141
replace-paths (reduce #(append-unique %1 (:replace-paths %2 )) nil alias-maps)
145
146
(if (or replace-deps-old replace-deps)
146
147
(merge replace-deps-old replace-deps)
147
148
%)
149
+ override-deps
148
150
extra-deps))
149
151
(update :paths #(append-unique extra-paths
150
152
(if (or replace-paths-old replace-paths)
You can’t perform that action at this time.
0 commit comments