Fetch umbrella child deps across environments without conflicts

Closes #4069 #4105

Author: José Valim

lib/mix/lib/mix/dep/loader.ex

@@ -236,7 +236,17 @@ defmodule Mix.Dep.Loader do
         opts = Keyword.put_new(opts, :app, false)
       end
 
-      deps = mix_children(env: opts[:env] || :prod) ++ Mix.Dep.Umbrella.unloaded
+      child_opts =
+        cond do
+          opts[:from_umbrella] ->
+            []
+          env = opts[:env] ->
+            [env: env]
+          true ->
+            [env: :prod]
+        end
+
+      deps = mix_children(child_opts) ++ Mix.Dep.Umbrella.unloaded
       {%{dep | opts: opts}, deps}
     end)
   end

lib/mix/lib/mix/scm/path.ex

@@ -17,7 +17,7 @@ defmodule Mix.SCM.Path do
   def accepts_options(app, opts) do
     cond do
       raw = opts[:path] ->
-        Keyword.put opts, :dest, Path.expand(raw)
+        Keyword.put(opts, :dest, Path.expand(raw))
       opts[:in_umbrella] ->
         path = "../#{app}"
 

lib/mix/lib/mix/tasks/compile.ex

@@ -97,8 +97,6 @@ defmodule Mix.Tasks.Compile do
     manifest = Path.absname(Mix.Dep.Lock.manifest())
 
     Enum.any?(Mix.Dep.children(), fn %{scm: scm} = dep ->
-      # We ignore in_umbrella dependencies because we assume
-      # they are sharing the same deps and build path.
       not scm.fetchable? and Mix.Dep.in_dependency(dep, fn _ ->
         files = Mix.Project.config_files ++ manifests()
         Mix.Utils.stale?(files, [manifest])

lib/mix/test/mix/umbrella_test.exs

@@ -98,6 +98,63 @@ defmodule Mix.UmbrellaTest do
     end
   end
 
+  test "loads umbrella child dependencies in all environments" do
+    in_fixture "umbrella_dep/deps/umbrella", fn ->
+      Mix.Project.in_project :umbrella, ".", fn _ ->
+        File.write! "apps/bar/mix.exs", """
+        defmodule Bar.Mix do
+          use Mix.Project
+
+          def project do
+            [app: :bar,
+             version: "0.1.0",
+             deps: [{:git_repo, git: MixTest.Case.fixture_path("git_repo"), only: :other}]]
+          end
+        end
+        """
+
+        # Should work across all environments
+        Mix.Tasks.Deps.Get.run []
+        assert_received {:mix_shell, :info, ["* Getting git_repo" <> _]}
+
+        # Works on the current environment only
+        Mix.Tasks.Deps.run []
+        refute_received {:mix_shell, :info, ["* git_repo " <> _]}
+
+        # Works on the other environment only
+        Mix.env(:other)
+        Mix.Tasks.Deps.run []
+        assert_received {:mix_shell, :info, ["* git_repo " <> _]}
+      end
+    end
+  after
+    Mix.env(:test)
+  end
+
+  test "loads umbrella child dependencies in umbrellas" do
+    in_fixture "umbrella_dep/deps/umbrella", fn ->
+      Mix.Project.in_project :umbrella, ".", fn _ ->
+        File.write! "apps/bar/mix.exs", """
+        defmodule Bar.Mix do
+          use Mix.Project
+
+          def project do
+            [app: :bar,
+             version: "0.1.0",
+             deps: [{:foo, in_umbrella: true}]]
+          end
+        end
+        """
+
+        # Running from umbrella should not cause conflicts
+        Mix.Tasks.Deps.Get.run []
+        Mix.Tasks.Run.run []
+      end
+    end
+  end
+
+  ## Umbrellas as a dependency
+
   test "list deps for umbrella as dependency" do
     in_fixture("umbrella_dep", fn ->
       Mix.Project.in_project(:umbrella_dep, ".", fn _ ->