Skip to content

Commit 3ba80f0

Browse files
Damien Kicktonsky
Damien Kick
authored andcommitted
merge :override-deps from :aliases
1 parent a7b1dc2 commit 3ba80f0

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,6 @@ pom.xml.asc
1212
*.sublime-workspace
1313
.DS_Store
1414
.cpcache
15+
.clj-kondo
16+
.lsp
1517
!test_projects/mergers/project_c.jar

src/uberdeps/api.clj

+2
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@
135135
alias-maps (mapv (:aliases deps-map) aliases)
136136
replace-deps-old (reduce #(merge %1 (:deps %2)) nil alias-maps)
137137
replace-deps (reduce #(merge %1 (:replace-deps %2)) nil alias-maps)
138+
override-deps (reduce #(merge %1 (:override-deps %2)) nil alias-maps)
138139
extra-deps (reduce #(merge %1 (:extra-deps %2)) nil alias-maps)
139140
replace-paths-old (reduce #(append-unique %1 (:paths %2)) nil alias-maps)
140141
replace-paths (reduce #(append-unique %1 (:replace-paths %2)) nil alias-maps)
@@ -145,6 +146,7 @@
145146
(if (or replace-deps-old replace-deps)
146147
(merge replace-deps-old replace-deps)
147148
%)
149+
override-deps
148150
extra-deps))
149151
(update :paths #(append-unique extra-paths
150152
(if (or replace-paths-old replace-paths)

0 commit comments

Comments
 (0)