Store all manifests in a single .mix directory

Author: José Valim

lib/mix/lib/mix/compilers/elixir.ex

@@ -433,7 +433,7 @@ defmodule Mix.Compilers.Elixir do
 
     for %{scm: scm, opts: opts} = dep <- Mix.Dep.cached(),
         not scm.fetchable?,
-        Mix.Utils.last_modified(Path.join(opts[:build], base)) > modified,
+        Mix.Utils.last_modified(Path.join([opts[:build], ".mix", base])) > modified,
         path <- Mix.Dep.load_paths(dep),
         beam <- Path.wildcard(Path.join(path, "*.beam")),
         Mix.Utils.last_modified(beam) > modified,

lib/mix/lib/mix/compilers/erlang.ex

@@ -17,7 +17,7 @@ defmodule Mix.Compilers.Erlang do
   For example, a simple compiler for Lisp Flavored Erlang
   would be implemented like:
 
-      manifest = Path.join Mix.Project.manifest_path, ".compile.lfe"
+      manifest = Path.join Mix.Project.manifest_path, "compile.lfe"
       dest = Mix.Project.compile_path
 
       compile manifest, [{"src", dest}], :lfe, :beam, opts, fn input, output ->
@@ -221,7 +221,7 @@ defmodule Mix.Compilers.Erlang do
   end
 
   defp write_manifest(file, entries, timestamp) do
-    Path.dirname(file) |> File.mkdir_p!()
+    File.mkdir_p!(Path.dirname(file))
     File.write!(file, :erlang.term_to_binary({@manifest_vsn, entries}))
     File.touch!(file, timestamp)
   end

lib/mix/lib/mix/compilers/test.ex

@@ -11,7 +11,7 @@ defmodule Mix.Compilers.Test do
     runtime_references: [],
     external: []
 
-  @stale_manifest ".compile.test_stale"
+  @stale_manifest "compile.test_stale"
   @manifest_vsn 1
 
   @doc """
@@ -183,23 +183,15 @@ defmodule Mix.Compilers.Test do
   end
 
   defp write_manifest([]) do
-    manifest()
-    |> File.rm()
-
+    File.rm(manifest())
     :ok
   end
 
   defp write_manifest(sources) do
     manifest = manifest()
+    File.mkdir_p!(Path.dirname(manifest))
 
-    manifest
-    |> Path.dirname()
-    |> File.mkdir_p!()
-
-    manifest_data =
-      [@manifest_vsn | sources]
-      |> :erlang.term_to_binary([:compressed])
-
+    manifest_data = :erlang.term_to_binary([@manifest_vsn | sources], [:compressed])
     File.write!(manifest, manifest_data)
   end
 

lib/mix/lib/mix/dep.ex

@@ -336,7 +336,7 @@ defmodule Mix.Dep do
   defp check_manifest(%{scm: scm} = dep, build_path) do
     vsn = {System.version(), :erlang.system_info(:otp_release)}
 
-    case Mix.Dep.ElixirSCM.read(build_path) do
+    case Mix.Dep.ElixirSCM.read(Path.join(build_path, ".mix")) do
       {:ok, old_vsn, _} when old_vsn != vsn ->
         %{dep | status: {:elixirlock, old_vsn}}
 

lib/mix/lib/mix/dep/elixir_scm.ex

@@ -1,7 +1,7 @@
 # Manifest file where we treat Elixir and SCMs as a dependency.
 defmodule Mix.Dep.ElixirSCM do
   @moduledoc false
-  @manifest ".compile.elixir_scm"
+  @manifest "compile.elixir_scm"
   @manifest_vsn 1
 
   def manifest(manifest_path \\ Mix.Project.manifest_path()) do

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

@@ -379,7 +379,7 @@ defmodule Mix.Dep.Loader do
     scm.fetchable? &&
       Mix.Utils.stale?(
         join_stale(opts, :dest, ".fetch"),
-        join_stale(opts, :build, ".compile.fetch")
+        join_stale(opts, :build, ".mix/compile.fetch")
       )
   end
 

lib/mix/lib/mix/dep/lock.ex

@@ -5,7 +5,7 @@
 defmodule Mix.Dep.Lock do
   @moduledoc false
 
-  @manifest ".compile.lock"
+  @manifest "compile.lock"
 
   @doc """
   Returns the manifest file for dependencies.
@@ -32,11 +32,13 @@ defmodule Mix.Dep.Lock do
   """
   @spec read() :: map
   def read() do
-    case File.read(lockfile()) do
+    lockfile = lockfile()
+
+    case File.read(lockfile) do
       {:ok, info} ->
-        assert_no_merge_conflicts_in_lockfile(lockfile(), info)
+        assert_no_merge_conflicts_in_lockfile(lockfile, info)
 
-        case Code.eval_string(info, [], file: lockfile()) do
+        case Code.eval_string(info, [], file: lockfile) do
           {lock, _binding} when is_map(lock) -> lock
           {_, _binding} -> %{}
         end

lib/mix/lib/mix/project.ex

@@ -448,17 +448,20 @@ defmodule Mix.Project do
   ## Examples
 
       Mix.Project.manifest_path
-      #=> "/path/to/project/_build/shared/lib/app"
+      #=> "/path/to/project/_build/shared/lib/app/.mix"
 
   """
   @spec manifest_path(keyword) :: Path.t()
   def manifest_path(config \\ config()) do
-    config[:app_path] ||
-      if app = config[:app] do
-        Path.join([build_path(config), "lib", Atom.to_string(app)])
-      else
-        build_path(config)
-      end
+    app_path =
+      config[:app_path] ||
+        if app = config[:app] do
+          Path.join([build_path(config), "lib", Atom.to_string(app)])
+        else
+          build_path(config)
+        end
+
+    Path.join(app_path, ".mix")
   end
 
   @doc """

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

@@ -2,7 +2,7 @@ defmodule Mix.Tasks.Compile.Elixir do
   use Mix.Task.Compiler
 
   @recursive true
-  @manifest ".compile.elixir"
+  @manifest "compile.elixir"
 
   @moduledoc """
   Compiles Elixir source files.

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

@@ -3,7 +3,7 @@ defmodule Mix.Tasks.Compile.Erlang do
   import Mix.Compilers.Erlang
 
   @recursive true
-  @manifest ".compile.erlang"
+  @manifest "compile.erlang"
   @switches [force: :boolean, all_warnings: :boolean]
 
   @moduledoc """