Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/mix/lib/mix/dep/loader.ex
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ defmodule Mix.Dep.Loader do

# Note that we ignore Make dependencies because the
# file based heuristic will always figure it out.
@scm_managers ~w(mix rebar rebar3)a
@scm_managers ~w(mix rebar3)a

defp scm_manager(scm, opts) do
managers = scm.managers(opts)
Expand Down
4 changes: 2 additions & 2 deletions lib/mix/lib/mix/tasks/deps.ex
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ defmodule Mix.Tasks.Deps do
* `:override` - if set to `true` the dependency will override any other
definitions of itself by other dependencies

* `:manager` - Mix can also compile Rebar, Rebar3 and makefile projects
and can fetch sub dependencies of Rebar and Rebar3 projects. Mix will
* `:manager` - Mix can also compile Rebar3 and makefile projects
and can fetch sub dependencies of Rebar3 projects. Mix will
try to infer the type of project but it can be overridden with this
option by setting it to `:mix`, `:rebar3`, or `:make`. In case
there are conflicting definitions, the first manager in the list above
Expand Down
2 changes: 0 additions & 2 deletions lib/mix/lib/mix/tasks/local.rebar.ex
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ defmodule Mix.Tasks.Local.Rebar do

## Command line options

* `rebar PATH` - specifies a path for `rebar`

* `rebar3 PATH` - specifies a path for `rebar3`

* `--sha512` - checks the Rebar script matches the given SHA-512 checksum
Expand Down
4 changes: 2 additions & 2 deletions lib/mix/test/mix/dep_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -194,15 +194,15 @@ defmodule Mix.DepTest do
Process.put(:custom_deps_git_repo_opts, manager: :make)

deps = [
{:deps_repo, "0.1.0", path: "custom/deps_repo", manager: :rebar},
{:deps_repo, "0.1.0", path: "custom/deps_repo", manager: :rebar3},
{:git_repo, "0.2.0", git: MixTest.Case.fixture_path("git_repo")}
]

with_deps(deps, fn ->
in_fixture("deps_status", fn ->
[dep1, dep2] = Mix.Dep.load_on_environment([])
assert dep1.manager == nil
assert dep2.manager == :rebar
assert dep2.manager == :rebar3
end)
end)
end
Expand Down
3 changes: 1 addition & 2 deletions lib/mix/test/test_helper.exs
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ Application.put_env(:logger, :backends, [])
os_exclude = if match?({:win32, _}, :os.type()), do: [unix: true], else: [windows: true]
epmd_exclude = if match?({:win32, _}, :os.type()), do: [epmd: true], else: []
git_exclude = if Mix.SCM.Git.git_version() <= {1, 7, 4}, do: [git_sparse: true], else: []
rebar_exclude = if System.otp_release() >= "25", do: [rebar: true], else: []

ExUnit.start(
trace: "--trace" in System.argv(),
exclude: epmd_exclude ++ os_exclude ++ git_exclude ++ rebar_exclude
exclude: epmd_exclude ++ os_exclude ++ git_exclude
)

# Clear environment variables that may affect tests
Expand Down