Recompile projects if OTP version changes, closes #6066

Author: José Valim

lib/mix/lib/mix/dep.ex

@@ -297,7 +297,7 @@ defmodule Mix.Dep do
   end
 
   defp check_manifest(%{scm: scm} = dep, build_path) do
-    vsn = System.version
+    vsn = {System.version, :erlang.system_info(:otp_release)}
 
     case Mix.Dep.ElixirSCM.read(build_path) do
       {:ok, old_vsn, _} when old_vsn != vsn ->

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

@@ -2,7 +2,7 @@
 defmodule Mix.Dep.ElixirSCM do
   @moduledoc false
   @manifest ".compile.elixir_scm"
-  @manifest_vsn :v1
+  @manifest_vsn :v2
 
   def manifest(manifest_path \\ Mix.Project.manifest_path) do
     Path.join(manifest_path, @manifest)
@@ -13,7 +13,7 @@ defmodule Mix.Dep.ElixirSCM do
     File.mkdir_p!(manifest_path)
 
     manifest_data =
-      {@manifest_vsn, System.version, config[:build_scm]}
+      {@manifest_vsn, {System.version, :erlang.system_info(:otp_release)}, config[:build_scm]}
       |> :erlang.term_to_binary(compressed: 9)
 
     File.write!(manifest(manifest_path), manifest_data)
@@ -23,15 +23,10 @@ defmodule Mix.Dep.ElixirSCM do
     case File.read(manifest(manifest_path)) do
       {:ok, contents} ->
         try do
-          :erlang.binary_to_term(contents)
-        else
-          {@manifest_vsn, vsn, scm} ->
-            {:ok, vsn, scm}
-          _ ->
-            {:ok, "1.0.0", nil} # Force old version if file exists but old format
+          {@manifest_vsn, vsn, scm} = :erlang.binary_to_term(contents)
+          {:ok, vsn, scm}
         rescue
-          _ ->
-            {:ok, "1.0.0", nil} # Force old version if file exists but old format
+          _ -> {:ok, {"1.0.0", '17'}, nil}
         end
       _ ->
         :error

lib/mix/lib/mix/tasks/loadpaths.ex

@@ -58,7 +58,7 @@ defmodule Mix.Tasks.Loadpaths do
   end
 
   defp load_project(config, _args) do
-    vsn = System.version
+    vsn = {System.version, :erlang.system_info(:otp_release)}
     scm = config[:build_scm]
 
     # Erase the app build if we have lock mismatch.

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

@@ -8,6 +8,8 @@ defmodule Mix.Tasks.Compile.ElixirTest do
     :ok
   end
 
+  @elixir_otp_version {System.version, :erlang.system_info(:otp_release)}
+
   test "compiles a project without per environment build" do
     Mix.Project.pop
     Mix.ProjectStack.post_config [build_per_environment: false]
@@ -43,7 +45,7 @@ defmodule Mix.Tasks.Compile.ElixirTest do
 
       assert File.exists?("_build/dev/lib/sample")
       assert File.exists?("_build/dev/consolidated")
-      assert Mix.Dep.ElixirSCM.read == {:ok, System.version, Mix.SCM.Path}
+      assert Mix.Dep.ElixirSCM.read == {:ok, @elixir_otp_version, Mix.SCM.Path}
 
       Mix.Task.clear
       File.write!("_build/dev/consolidated/.to_be_removed", "")
@@ -52,7 +54,7 @@ defmodule Mix.Tasks.Compile.ElixirTest do
       File.touch!("_build/dev/lib/sample/.compile.elixir_scm", {{2010, 1, 1}, {0, 0, 0}})
 
       Mix.Tasks.Compile.run []
-      assert Mix.Dep.ElixirSCM.read == {:ok, System.version, Mix.SCM.Path}
+      assert Mix.Dep.ElixirSCM.read == {:ok, @elixir_otp_version, Mix.SCM.Path}
       assert File.stat!("_build/dev/lib/sample/.compile.elixir_scm").mtime > {{2010, 1, 1}, {0, 0, 0}}
       refute File.exists?("_build/dev/consolidated/.to_be_removed")
     end
@@ -64,15 +66,15 @@ defmodule Mix.Tasks.Compile.ElixirTest do
       purge [A, B]
 
       assert_received {:mix_shell, :info, ["Compiled lib/a.ex"]}
-      assert Mix.Dep.ElixirSCM.read == {:ok, System.version, Mix.SCM.Path}
+      assert Mix.Dep.ElixirSCM.read == {:ok, @elixir_otp_version, Mix.SCM.Path}
 
       Mix.Task.clear
-      manifest_data = :erlang.term_to_binary({:v1, System.version, :another})
+      manifest_data = :erlang.term_to_binary({:v2, @elixir_otp_version, :another})
       File.write!("_build/dev/lib/sample/.compile.elixir_scm", manifest_data)
       File.touch!("_build/dev/lib/sample/.compile.elixir_scm", {{2010, 1, 1}, {0, 0, 0}})
 
       Mix.Tasks.Compile.run []
-      assert Mix.Dep.ElixirSCM.read == {:ok, System.version, Mix.SCM.Path}
+      assert Mix.Dep.ElixirSCM.read == {:ok, @elixir_otp_version, Mix.SCM.Path}
       assert File.stat!("_build/dev/lib/sample/.compile.elixir_scm").mtime > {{2010, 1, 1}, {0, 0, 0}}
     end
   end

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

@@ -571,7 +571,7 @@ defmodule Mix.Tasks.DepsTest do
       Mix.Tasks.Deps.Loadpaths.run []
 
       File.mkdir_p!("_build/dev/lib/ok/ebin")
-      manifest_data = :erlang.term_to_binary({:v1, System.version, :scm})
+      manifest_data = :erlang.term_to_binary({:v2, {System.version, :erlang.system_info(:otp_release)}, :scm})
       File.write!("_build/dev/lib/ok/.compile.elixir_scm", manifest_data)
       Mix.Task.clear