Skip to content

Commit b6ea6b6

Browse files
author
José Valim
committed
Merge pull request #1400 from ericmj/mix-deps-rebar
All deps of a rebar dep should be handled by rebar
2 parents 318eaeb + df4cee5 commit b6ea6b6

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

lib/mix/lib/mix/deps/retriever.ex

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,15 @@ defmodule Mix.Deps.Retriever do
7777

7878
if Mix.Deps.available?(dep) do
7979
cond do
80+
# Force all dependencies of a rebar dependency to be managed by rebar
81+
manager == :rebar or rebarconfig?(dep) or rebarexec?(dep) ->
82+
rebar_dep(dep)
83+
8084
mixfile?(dep) ->
8185
Mix.Deps.in_dependency(dep, fn project ->
8286
mix_dep(dep, project)
8387
end)
8488

85-
rebarconfig?(dep) or rebarexec?(dep) ->
86-
rebar_dep(dep)
87-
8889
makefile?(dep) ->
8990
make_dep(dep)
9091

0 commit comments

Comments
 (0)