Load extra applications for umbrellas

Author: josevalim

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

@@ -125,7 +125,7 @@ defmodule Mix.Tasks.Compile.All do
     Enum.reduce(Mix.ProjectStack.pop_after_compiler(compiler), result, & &1.(&2))
   end
 
-  defp project_apps(config) do
+  def project_apps(config) do
     project = Mix.Project.get!()
 
     properties =

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

@@ -148,8 +148,7 @@ defmodule Mix.Tasks.Compile do
     # If we are in an umbrella project, now load paths from all children.
     if apps_paths = Mix.Project.apps_paths(config) do
       loaded_paths =
-        apps_paths
-        |> Map.keys()
+        (Mix.Tasks.Compile.All.project_apps(config) ++ Map.keys(apps_paths))
         |> Mix.AppLoader.load_apps(Mix.Dep.cached(), config, [], fn
           {_app, path}, acc -> if path, do: [path | acc], else: acc
         end)

lib/mix/test/fixtures/umbrella_dep/deps/umbrella/mix.exs

@@ -4,4 +4,8 @@ defmodule Umbrella.MixProject do
   def project do
     [apps_path: "apps"]
   end
+
+  def application do
+    [extra_applications: [:runtime_tools]]
+  end
 end

lib/mix/test/mix/umbrella_test.exs

@@ -64,6 +64,10 @@ defmodule Mix.UmbrellaTest do
         Mix.Task.run("deps.loadpaths")
         Mix.Task.run("compile", ["--verbose"])
 
+        # Extra applications are picked even for umbrellas
+        assert :code.where_is_file(~c"runtime_tools.app") != :non_existing
+        assert :code.where_is_file(~c"observer.app") == :non_existing
+
         assert_received {:mix_shell, :info, ["==> bar"]}
         assert_received {:mix_shell, :info, ["Generated bar app"]}
         assert File.regular?("_build/dev/lib/bar/ebin/Elixir.Bar.beam")