Merge pull request #310 from treble37/elixir116_update

Elixir116 update
antonmi · Feb 1, 2024 · aa0cd24 · aa0cd24
2 parents fa3802a + 5d84011
commit aa0cd24
Show file tree

Hide file tree

Showing 5 changed files with 157 additions and 102 deletions.
diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml
@@ -23,6 +23,10 @@ jobs:
             elixir-version: '1.13.4'
           - otp-version: '25.0'
             elixir-version: '1.14.2'
+          - otp-version: '25.1.2'
+            elixir-version: '1.15.7'
+          - otp-version: '26.0'
+            elixir-version: '1.16.0'
     steps:
     - uses: actions/checkout@v2
     - name: Set up Elixir

diff --git a/lib/mix/utils/stale_compatible.ex b/lib/mix/utils/stale_compatible.ex
@@ -30,71 +30,107 @@ defmodule Mix.Utils.StaleCompatible do
 
   ## Test changed dependency resolution
 
-  def tests_with_changed_references(%Version{major: 1, minor: minor} = version, test_sources)
-      when minor >= 10 do
-    test_manifest = Stale.manifest()
-    [elixir_manifest] = Mix.Tasks.Compile.Elixir.manifests()
-
-    if Mix.Utils.stale?([elixir_manifest], [test_manifest]) do
-      compile_path = Mix.Project.compile_path()
-      {elixir_modules, elixir_sources} = apply(CE, :read_manifest, [elixir_manifest])
-
-      stale_modules =
-        for CE.module(module: module) <- elixir_modules,
-            beam = Path.join(compile_path, Atom.to_string(module) <> ".beam"),
-            Mix.Utils.stale?([beam], [test_manifest]),
-            do: module,
-            into: MapSet.new()
-
-      stale_modules =
-        find_all_dependent_on(version, stale_modules, elixir_sources, elixir_modules)
-
-      for module <- stale_modules,
-          source(source: source, runtime_references: r, compile_references: c) <- test_sources,
-          module in r or module in c,
-          do: source,
-          into: MapSet.new()
-    else
-      MapSet.new()
-    end
-  end
+  cond do
+    Version.match?(System.version(), "< 1.10.0") ->
+      def tests_with_changed_references(%Version{major: 1, minor: minor} = version, test_sources)
+          when minor < 10 do
+        test_manifest = Stale.manifest()
+        [elixir_manifest] = Mix.Tasks.Compile.Elixir.manifests()
+
+        if Mix.Utils.stale?([elixir_manifest], [test_manifest]) do
+          elixir_manifest_entries =
+            apply(CE, :read_manifest, [elixir_manifest, Mix.Project.compile_path()])
+            |> Enum.group_by(&elem(&1, 0))
+
+          stale_modules =
+            for CE.module(module: module) <- elixir_manifest_entries.module,
+                #  version 1.9 has this:
+                # for CE.module(module: module, beam: beam) <- elixir_manifest_entries.module
+                # but beam was removed in v1.10.
+                beam = Path.join(Mix.Project.compile_path(), Atom.to_string(module) <> ".beam"),
+                Mix.Utils.stale?([beam], [test_manifest]),
+                do: module,
+                into: MapSet.new()
+
+          stale_modules =
+            find_all_dependent_on(
+              version,
+              stale_modules,
+              elixir_manifest_entries.source,
+              elixir_manifest_entries.module
+            )
 
-  def tests_with_changed_references(%Version{major: 1, minor: minor} = version, test_sources)
-      when minor < 10 do
-    test_manifest = Stale.manifest()
-    [elixir_manifest] = Mix.Tasks.Compile.Elixir.manifests()
-
-    if Mix.Utils.stale?([elixir_manifest], [test_manifest]) do
-      elixir_manifest_entries =
-        apply(CE, :read_manifest, [elixir_manifest, Mix.Project.compile_path()])
-        |> Enum.group_by(&elem(&1, 0))
-
-      stale_modules =
-        for CE.module(module: module) <- elixir_manifest_entries.module,
-            #  version 1.9 has this:
-            # for CE.module(module: module, beam: beam) <- elixir_manifest_entries.module
-            # but beam was removed in v1.10.
-            beam = Path.join(Mix.Project.compile_path(), Atom.to_string(module) <> ".beam"),
-            Mix.Utils.stale?([beam], [test_manifest]),
-            do: module,
-            into: MapSet.new()
-
-      stale_modules =
-        find_all_dependent_on(
-          version,
-          stale_modules,
-          elixir_manifest_entries.source,
-          elixir_manifest_entries.module
-        )
+          for module <- stale_modules,
+              source(source: source, runtime_references: r, compile_references: c) <-
+                test_sources,
+              module in r or module in c,
+              do: source,
+              into: MapSet.new()
+        else
+          MapSet.new()
+        end
+      end
 
-      for module <- stale_modules,
-          source(source: source, runtime_references: r, compile_references: c) <- test_sources,
-          module in r or module in c,
-          do: source,
-          into: MapSet.new()
-    else
-      MapSet.new()
-    end
+    Version.match?(System.version(), "< 1.16.0") ->
+      def tests_with_changed_references(%Version{major: 1, minor: minor} = version, test_sources)
+          when minor >= 10 and minor < 16 do
+        test_manifest = Stale.manifest()
+        [elixir_manifest] = Mix.Tasks.Compile.Elixir.manifests()
+
+        if Mix.Utils.stale?([elixir_manifest], [test_manifest]) do
+          compile_path = Mix.Project.compile_path()
+          {elixir_modules, elixir_sources} = apply(CE, :read_manifest, [elixir_manifest])
+
+          stale_modules =
+            for CE.module(module: module) <- elixir_modules,
+                beam = Path.join(compile_path, Atom.to_string(module) <> ".beam"),
+                Mix.Utils.stale?([beam], [test_manifest]),
+                do: module,
+                into: MapSet.new()
+
+          stale_modules =
+            find_all_dependent_on(version, stale_modules, elixir_sources, elixir_modules)
+
+          for module <- stale_modules,
+              source(source: source, runtime_references: r, compile_references: c) <-
+                test_sources,
+              module in r or module in c,
+              do: source,
+              into: MapSet.new()
+        else
+          MapSet.new()
+        end
+      end
+
+    true ->
+      def tests_with_changed_references(%Version{major: 1} = version, test_sources) do
+        test_manifest = Stale.manifest()
+        [elixir_manifest] = Mix.Tasks.Compile.Elixir.manifests()
+
+        if Mix.Utils.stale?([elixir_manifest], [test_manifest]) do
+          compile_path = Mix.Project.compile_path()
+          {elixir_modules, elixir_sources} = apply(CE, :read_manifest, [elixir_manifest])
+
+          stale_modules =
+            for {module, _} <- elixir_modules,
+                beam = Path.join(compile_path, Atom.to_string(module) <> ".beam"),
+                Mix.Utils.stale?([beam], [test_manifest]),
+                do: module,
+                into: MapSet.new()
+
+          stale_modules =
+            find_all_dependent_on(version, stale_modules, elixir_sources, elixir_modules)
+
+          for module <- stale_modules,
+              source(source: source, runtime_references: r, compile_references: c) <-
+                test_sources,
+              module in r or module in c,
+              do: source,
+              into: MapSet.new()
+        else
+          MapSet.new()
+        end
+      end
   end
 
   ## ParallelRequire callback: Handled differently depending on Elixir version
@@ -225,42 +261,50 @@ defmodule Mix.Utils.StaleCompatible do
     end
   end
 
-  if Version.match?(System.version(), "< 1.11.0") do
-    defp dependent_modules(%Version{major: 1, minor: minor}, module, modules, sources)
-         when minor >= 10 do
-      for CE.source(
-            source: source,
-            runtime_references: r,
-            compile_references: c,
-            struct_references: s
-          ) <- sources,
-          module in r or module in c or module in s,
-          CE.module(sources: sources, module: dependent_module) <- modules,
-          source in sources,
-          do: dependent_module
-    end
-  else
-    defp dependent_modules(%Version{major: 1, minor: minor}, module, modules, sources)
-         when minor >= 11 do
-      for CE.source(
-            source: source,
-            runtime_references: r,
-            compile_references: c,
-            export_references: s
-          ) <- sources,
-          module in r or module in c or module in s,
-          CE.module(sources: sources, module: dependent_module) <- modules,
-          source in sources,
-          do: dependent_module
-    end
-  end
+  cond do
+    Version.match?(System.version(), "< 1.11.0") ->
+      defp dependent_modules(%Version{major: 1, minor: minor}, module, modules, sources)
+           when minor >= 10 do
+        for CE.source(
+              source: source,
+              runtime_references: r,
+              compile_references: c,
+              struct_references: s
+            ) <- sources,
+            module in r or module in c or module in s,
+            CE.module(sources: sources, module: dependent_module) <- modules,
+            source in sources,
+            do: dependent_module
+      end
 
-  defp dependent_modules(%Version{}, module, modules, sources) do
-    for CE.source(source: source, runtime_references: r, compile_references: c) <- sources,
-        module in r or module in c,
-        CE.module(sources: sources, module: dependent_module) <- modules,
-        source in sources,
-        do: dependent_module
+    Version.match?(System.version(), "< 1.16.0") ->
+      defp dependent_modules(%Version{major: 1, minor: minor}, module, modules, sources)
+           when minor >= 11 do
+        for CE.source(
+              source: source,
+              runtime_references: r,
+              compile_references: c,
+              export_references: s
+            ) <- sources,
+            module in r or module in c or module in s,
+            CE.module(sources: sources, module: dependent_module) <- modules,
+            source in sources,
+            do: dependent_module
+      end
+
+    true ->
+      defp dependent_modules(%Version{}, module, modules, sources) do
+        for {source,
+             CE.source(
+               runtime_references: r,
+               compile_references: c,
+               export_references: e
+             )} <- sources,
+            module in r or module in c or module in e,
+            {dependent_module, CE.module(sources: sources)} <- modules,
+            source in sources,
+            do: dependent_module
+      end
   end
 
   defp parse_version do

diff --git a/spec/assertions/enum/have_all_spec.exs b/spec/assertions/enum/have_all_spec.exs
@@ -21,7 +21,9 @@ defmodule ESpec.Assertions.Enum.HaveAllSpec do
 
     it "checks success with `to`" do
       message = expect(dict()) |> to(have_all(positive()))
-      expect(message) |> to(end_with "returns `true` for all elements in `%{a: 1, b: 2, c: 3}`.")
+
+      expect(message)
+      |> to(end_with "returns `true` for all elements in `#{inspect(%{a: 1, b: 2, c: 3})}`.")
     end
 
     it "checks success with `not_to`" do

diff --git a/spec/assertions/eq_spec.exs b/spec/assertions/eq_spec.exs
@@ -31,7 +31,7 @@ defmodule ESpec.Assertions.EqSpec do
           {:shared,
            expectation: fn -> expect(%{a: 2, b: 3, c: 4}) |> to(eq(%{a: 2, b: 4})) end,
            message:
-             "Expected `%{a: 2, b: 3, c: 4}` to equal (==) `%{a: 2, b: 4}`, but it doesn't.",
+             "Expected `#{inspect(%{a: 2, b: 3, c: 4})}` to equal (==) `%{a: 2, b: 4}`, but it doesn't.",
            extra: true}
         end
 

diff --git a/spec/diff_spec.exs b/spec/diff_spec.exs
@@ -2,7 +2,8 @@ defmodule DiffSpec do
   use ESpec, async: true
 
   defmacrop diff_1_2 do
-    if Version.match?(System.version(), ">= 1.10.0") do
+    if Version.match?(System.version(), ">= 1.10.0") and
+         Version.match?(System.version(), "< 1.15.0") do
       quote do
         %ExUnit.Diff{
           equivalent?: false,
@@ -12,7 +13,11 @@ defmodule DiffSpec do
       end
     else
       quote do
-        {[ins: "1"], [del: "2"]}
+        %ExUnit.Diff{
+          equivalent?: false,
+          left: %{delimiter: nil, contents: [true: "2"]},
+          right: %{delimiter: nil, contents: [true: "1"]}
+        }
       end
     end
   end