Also version rebar dependencies according to otp-elixir-scm, closes #14548

Author: josevalim

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

@@ -922,7 +922,7 @@ defmodule Mix.Compilers.Elixir do
     # Since Elixir is a dependency itself, we need to touch the lock
     # so the current Elixir version, used to compile the files above,
     # is properly stored.
-    Mix.Dep.ElixirSCM.update()
+    Mix.Dep.ElixirSCM.update(Mix.Project.config()[:build_scm])
     :ok
   end
 

lib/mix/lib/mix/dep.ex

@@ -384,8 +384,8 @@ defmodule Mix.Dep do
     end
   end
 
-  def format_status(%Mix.Dep{status: {:elixirlock, _}}) do
-    "the dependency was built with an out-of-date Elixir version, run \"#{mix_env_var()}mix deps.compile\""
+  def format_status(%Mix.Dep{status: {:vsnlock, _}}) do
+    "the dependency was built with an out-of-date Erlang/Elixir version, run \"#{mix_env_var()}mix deps.compile\""
   end
 
   def format_status(%Mix.Dep{status: {:scmlock, _}}) do
@@ -448,7 +448,7 @@ defmodule Mix.Dep do
 
     case Mix.Dep.ElixirSCM.read(Path.join(build_path, ".mix")) do
       {:ok, old_vsn, _} when old_vsn != vsn ->
-        %{dep | status: {:elixirlock, old_vsn}}
+        %{dep | status: {:vsnlock, old_vsn}}
 
       {:ok, _, old_scm} when old_scm != scm ->
         %{dep | status: {:scmlock, old_scm}}
@@ -485,7 +485,7 @@ defmodule Mix.Dep do
   @doc """
   Returns `true` if the dependency is compilable.
   """
-  def compilable?(%Mix.Dep{status: {:elixirlock, _}}), do: true
+  def compilable?(%Mix.Dep{status: {:vsnlock, _}}), do: true
   def compilable?(%Mix.Dep{status: {:noappfile, {_, _}}}), do: true
   def compilable?(%Mix.Dep{status: {:scmlock, _}}), do: true
   def compilable?(%Mix.Dep{status: :compile}), do: true

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

@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2021 The Elixir Team
 # SPDX-FileCopyrightText: 2012 Plataformatec
 
-# Manifest file where we treat Elixir and SCMs as a dependency.
+# Manifest file where we treat Erlang/OTP, Elixir and SCMs as a dependency.
 defmodule Mix.Dep.ElixirSCM do
   @moduledoc false
   @manifest "compile.elixir_scm"
@@ -12,12 +12,11 @@ defmodule Mix.Dep.ElixirSCM do
     Path.join(manifest_path, @manifest)
   end
 
-  def update(manifest_path \\ Mix.Project.manifest_path()) do
-    config = Mix.Project.config()
+  def update(manifest_path \\ Mix.Project.manifest_path(), scm) do
     File.mkdir_p!(manifest_path)
 
     manifest_data =
-      {@manifest_vsn, {System.version(), :erlang.system_info(:otp_release)}, config[:build_scm]}
+      {@manifest_vsn, {System.version(), :erlang.system_info(:otp_release)}, scm}
       |> :erlang.term_to_binary()
 
     File.write!(manifest(manifest_path), manifest_data)

lib/mix/lib/mix/dep/fetcher.ex

@@ -127,7 +127,7 @@ defmodule Mix.Dep.Fetcher do
 
     for %Mix.Dep{app: app, scm: scm} <- deps, scm.fetchable?() do
       build_path
-      |> Path.join("*/lib/#{app}/.mix/compile.fetch")
+      |> Path.join("*/lib/#{app}/.mix/compile.elixir_scm")
       |> Path.wildcard(match_dot: true)
       |> Enum.each(&File.rm/1)
     end

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

@@ -407,7 +407,7 @@ defmodule Mix.Dep.Loader do
   end
 
   defp recently_fetched?(%Mix.Dep{opts: opts, scm: scm}) do
-    scm.fetchable?() and not File.exists?(Path.join(opts[:build], ".mix/compile.fetch"))
+    scm.fetchable?() and not File.exists?(Path.join(opts[:build], ".mix/compile.elixir_scm"))
   end
 
   defp app_status(app_path, app, req) do

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

@@ -191,9 +191,7 @@ defmodule Mix.Tasks.Deps.Compile do
 
   defp touch_fetchable(scm, path) do
     if scm.fetchable?() do
-      path = Path.join(path, ".mix")
-      File.mkdir_p!(path)
-      File.touch!(Path.join(path, "compile.fetch"))
+      Mix.Dep.ElixirSCM.update(Path.join(path, ".mix"), scm)
       true
     else
       false

lib/mix/test/mix/tasks/deps.git_test.exs

@@ -170,13 +170,13 @@ defmodule Mix.Tasks.DepsGitTest do
 
       # Compile the dependencies
       Mix.Tasks.Deps.Compile.run([])
-      assert File.exists?("_build/dev/lib/deps_on_git_repo/.mix/compile.fetch")
-      assert File.exists?("_build/dev/lib/git_repo/.mix/compile.fetch")
+      assert File.exists?("_build/dev/lib/deps_on_git_repo/.mix/compile.elixir_scm")
+      assert File.exists?("_build/dev/lib/git_repo/.mix/compile.elixir_scm")
 
       # Now update children and make sure it propagates
       Mix.Tasks.Deps.Update.run(["git_repo"])
-      refute File.exists?("_build/dev/lib/deps_on_git_repo/.mix/compile.fetch")
-      refute File.exists?("_build/dev/lib/git_repo/.mix/compile.fetch")
+      refute File.exists?("_build/dev/lib/deps_on_git_repo/.mix/compile.elixir_scm")
+      refute File.exists?("_build/dev/lib/git_repo/.mix/compile.elixir_scm")
 
       # Clear tasks to recompile Git repo but unload it so...
       purge([GitRepo])
@@ -408,7 +408,7 @@ defmodule Mix.Tasks.DepsGitTest do
       assert File.exists?("deps/git_repo/lib/git_repo.ex")
       assert File.read!("mix.lock") =~ last
       assert File.read!("deps/deps_on_git_repo/lib/deps_on_git_repo.ex") =~ "GitRepo.hello()"
-      refute File.exists?("_build/dev/lib/git_repo/.mix/compile.fetch")
+      refute File.exists?("_build/dev/lib/git_repo/.mix/compile.elixir_scm")
     end)
   after
     purge([GitRepo, GitRepo.MixProject])
@@ -441,7 +441,7 @@ defmodule Mix.Tasks.DepsGitTest do
       assert File.exists?("deps/git_repo/lib/git_repo.ex")
       assert File.read!("mix.lock") =~ last
       assert File.read!("deps/deps_on_git_repo/lib/deps_on_git_repo.ex") =~ "GitRepo.hello()"
-      refute File.exists?("_build/dev/lib/git_repo/.mix/compile.fetch")
+      refute File.exists?("_build/dev/lib/git_repo/.mix/compile.elixir_scm")
     end)
   after
     purge([GitRepo, GitRepo.MixProject])

lib/mix/test/mix/tasks/deps_test.exs

@@ -740,7 +740,7 @@ defmodule Mix.Tasks.DepsTest do
       Mix.Task.clear()
 
       msg =
-        "  the dependency was built with an out-of-date Elixir version, run \"mix deps.compile\""
+        "  the dependency was built with an out-of-date Erlang/Elixir version, run \"mix deps.compile\""
 
       Mix.Tasks.Deps.run([])
       assert_received {:mix_shell, :info, [^msg]}