Add support for :application option in Compile.App

Author: Papipo

lib/mix/lib/mix/gleam.ex

@@ -30,7 +30,7 @@ defmodule Mix.Gleam do
       deps: deps ++ dev_deps
     }
     |> maybe_gleam_version(json)
-    |> maybe_erlang_opts(json)
+    |> maybe_erlang_opts(json["erlang"])
   rescue
     KeyError ->
       Mix.raise("Command \"gleam export package-information\" unexpected format: \n" <> json)
@@ -45,7 +45,7 @@ defmodule Mix.Gleam do
           {dep, version, opts}
 
         %{"path" => path} ->
-          {dep, Keyword.merge(opts, path: Path.expand(path))}
+          {dep, Keyword.merge(opts, path: path)}
 
         %{"git" => git, "ref" => ref} ->
           {dep, git: git, ref: ref}
@@ -67,17 +67,24 @@ defmodule Mix.Gleam do
     end
   end
 
-  defp maybe_erlang_opts(config, json) do
-    config =
-      case get_in(json, ["erlang", "application_start_module"]) do
-        nil -> config
-        mod -> Map.put(config, :mod, mod)
-      end
+  defp maybe_erlang_opts(config, nil), do: config
 
-    case get_in(json, ["erlang", "extra_applications"]) do
-      nil -> config
-      extra_applications -> Map.put(config, :extra_applications, extra_applications)
-    end
+  defp maybe_erlang_opts(config, opts) do
+    application =
+      opts
+      |> Enum.filter(fn {_, value} -> value != nil end)
+      |> Enum.map(fn
+        {"application_start_module", module} when is_binary(module) ->
+          {:mod, {String.to_atom(module), []}}
+
+        {"extra_applications", applications} when is_list(applications) ->
+          {:extra_applications, Enum.map(applications, &String.to_atom/1)}
+
+        {key, value} ->
+          IO.warn("Gleam [erlang] option not supported\n #{key}: #{inspect(value)}")
+      end)
+
+    Map.put(config, :application, application)
   end
 
   def require!() do

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

@@ -182,7 +182,7 @@ defmodule Mix.Tasks.Compile.App do
           registered: [],
           vsn: to_charlist(version)
         ]
-        |> merge_project_application(project)
+        |> merge_project_application(project, config[:application])
         |> handle_extra_applications(config)
         |> add_compile_env(current_properties)
         |> add_modules(modules, compile_path)
@@ -252,7 +252,7 @@ defmodule Mix.Tasks.Compile.App do
     end
   end
 
-  defp merge_project_application(best_guess, project) do
+  defp merge_project_application(best_guess, project, _application = nil) do
     if function_exported?(project, :application, 0) do
       project_application = project.application()
 
@@ -268,6 +268,14 @@ defmodule Mix.Tasks.Compile.App do
     end
   end
 
+  defp merge_project_application(best_guess, _project, application) do
+    if not Keyword.keyword?(application) do
+      Mix.raise("Application configuration passed as :application should be a keyword list")
+    end
+
+    Keyword.merge(best_guess, validate_properties!(application))
+  end
+
   defp validate_properties!(properties) do
     Enum.each(properties, fn
       {:description, value} ->

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

@@ -334,7 +334,18 @@ defmodule Mix.Tasks.Deps.Compile do
 
     command =
       {"gleam",
-       ~w(compile-package --no-beam --target erlang --package #{package} --out #{out} --lib #{lib})}
+       [
+         "compile-package",
+         "--no-beam",
+         "--target",
+         "erlang",
+         "--package",
+         package,
+         "--out",
+         out,
+         "--lib",
+         lib
+       ]}
 
     shell_cmd!(dep, config, command)
 

lib/mix/test/mix/gleam_test.exs

@@ -53,7 +53,8 @@ defmodule Mix.GleamTest do
             "gleeunit" => %{"version" => ">= 1.0.0 and < 2.0.0"}
           },
           "erlang" => %{
-            "application_start_module" => "some@application"
+            "application_start_module" => "some@application",
+            "extra_applications" => ["some_app"]
           }
         }
         |> Mix.Gleam.parse_config()
@@ -69,7 +70,8 @@ defmodule Mix.GleamTest do
                  {:gleeunit, ">= 1.0.0 and < 2.0.0", only: :dev}
                ],
                application: [
-                 mod: {:some@application, []}
+                 mod: {:some@application, []},
+                 extra_applications: [:some_app]
                ]
              }
     end
@@ -103,8 +105,6 @@ defmodule Mix.GleamTest do
                      {:description, ~c"gleam_dep"},
                      {:registered, []},
                      {:vsn, ~c"1.0.0"}
-                     # Need to add support for :application option in Compile.App
-                     #  {:mod, {:gleam_dep@somemodule, []}}
                    ]
                  }
                ]

lib/mix/test/mix/tasks/compile.app_test.exs

@@ -283,6 +283,30 @@ defmodule Mix.Tasks.Compile.AppTest do
     end)
   end
 
+  test "dynamic project" do
+    in_fixture("no_mixfile", fn ->
+      config =
+        Mix.Project.config()
+        |> Keyword.merge(
+          app: :dynamic_project,
+          version: "0.1.0",
+          application: [
+            mod: {DynamicProject, []},
+            applications: [:example_app, mix: :optional],
+            extra_applications: [:logger]
+          ]
+        )
+
+      Mix.ProjectStack.push(DynamicProject, config, "nofile")
+      Mix.Tasks.Compile.Elixir.run([])
+      Mix.Tasks.Compile.App.run([])
+
+      properties = parse_resource_file(:dynamic_project)
+      assert properties[:mod] == {DynamicProject, []}
+      assert properties[:applications] == [:kernel, :stdlib, :elixir, :logger, :example_app, :mix]
+    end)
+  end
+
   defp parse_resource_file(app) do
     {:ok, [term]} = :file.consult("_build/dev/lib/#{app}/ebin/#{app}.app")
     {:application, ^app, properties} = term