Run on Elixir 1.15 and Erlang 26 (#386)

dabaer · angelikatyborska · web-flow · commit 2b248b170897 · 2023-07-02T08:37:28.000+02:00
Co-authored-by: Angelika Tyborska &lt;angelikatyborska@fastmail.com&gt;
diff --git a/.github/workflows/elixir_test.yml b/.github/workflows/elixir_test.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: hexpm/elixir:1.14.0-erlang-25.0.4-debian-bullseye-20220801
+      image: hexpm/elixir:1.15.2-erlang-26.0.2-debian-bookworm-20230612
 
     steps:
       - name: Install git
@@ -53,7 +53,7 @@ jobs:
         id: plt-cache
         with:
           path: priv/plts
-          key: elixir:1.14.0-erlang-25.0.4-debian-bullseye-20220801-plts-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }}-v3
+          key: elixir:1.15.2-erlang-26.0.2-debian-bookworm-20230612-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }}-v3
 
       - name: Create PLTs
         if: steps.plt-cache.outputs.cache-hit != 'true'
diff --git a/.github/workflows/elixir_test_external.yml b/.github/workflows/elixir_test_external.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: hexpm/elixir:1.14.0-erlang-25.0.4-debian-bullseye-20220801
+      image: hexpm/elixir:1.15.2-erlang-26.0.2-debian-bookworm-20230612
 
     steps:
       - name: Install git
diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1,2 @@
-elixir 1.14.0-otp-25
-erlang 25.0.4
+elixir 1.15.2-otp-26
+erlang 26.0.2
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM hexpm/elixir:1.14.0-erlang-25.0.4-debian-bullseye-20220801 as builder
+FROM hexpm/elixir:1.15.2-erlang-26.0.2-debian-bookworm-20230612 as builder
 
 RUN apt-get update && \
   apt-get install bash -y
@@ -13,7 +13,7 @@ COPY . .
 # Builds an escript bin/elixir_analyzer
 RUN ./bin/build.sh
 
-FROM hexpm/elixir:1.14.0-erlang-25.0.4-debian-bullseye-20220801
+FROM hexpm/elixir:1.15.2-erlang-26.0.2-debian-bookworm-20230612
 COPY --from=builder /etc/passwd /etc/passwd
 
 COPY --from=builder /elixir-analyzer/bin /opt/analyzer/bin
diff --git a/config/test.exs b/config/test.exs
@@ -1,3 +1,3 @@
 import Config
 
-config :logger, level: :warn
+config :logger, level: :warning
diff --git a/elixir b/elixir
@@ -1 +1 @@
-Subproject commit 08d41282251dd469790b801f35171f4a2f4cf666
+Subproject commit 02d3acc087e14c06c65576dc17010cdb522b7b55
diff --git a/lib/elixir_analyzer/exercise_test.ex b/lib/elixir_analyzer/exercise_test.ex
@@ -35,7 +35,7 @@ defmodule ElixirAnalyzer.ExerciseTest do
     feature_test_data = Module.get_attribute(env.module, :feature_tests)
     assert_call_data = Module.get_attribute(env.module, :assert_call_tests)
     check_source_data = Module.get_attribute(env.module, :check_source_tests)
-    suppress_tests = Module.get_attribute(env.module, :suppress_tests, [])
+    suppress_tests = Module.get_attribute(env.module, :suppress_tests) || []
 
     # placeholders for submission code
     code_ast = quote do: code_ast
diff --git a/lib/elixir_analyzer/exercise_test/common_checks/compiler_warnings.ex b/lib/elixir_analyzer/exercise_test/common_checks/compiler_warnings.ex
@@ -24,7 +24,7 @@ defmodule ElixirAnalyzer.ExerciseTest.CommonChecks.CompilerWarnings do
           []
       end
 
-    Logger.configure(level: :warn)
+    Logger.configure(level: :warning)
 
     Application.put_env(:elixir, :ansi_enabled, true)
 
diff --git a/lib/elixir_analyzer/test_suite/german_sysadmin.ex b/lib/elixir_analyzer/test_suite/german_sysadmin.ex
@@ -25,12 +25,6 @@ defmodule ElixirAnalyzer.TestSuite.GermanSysadmin do
     comment Constants.german_sysadmin_no_string()
   end
 
-  assert_no_call "doesn't create binaries from character codes" do
-    type :essential
-    called_fn name: :<<>>
-    comment Constants.german_sysadmin_no_string()
-  end
-
   assert_call "using case is required" do
     type :essential
     called_fn name: :case
@@ -46,4 +40,32 @@ defmodule ElixirAnalyzer.TestSuite.GermanSysadmin do
       Enum.all?(integers, &String.contains?(code_string, &1))
     end
   end
+
+  check_source "doesn't create binaries from character codes" do
+    type :essential
+    comment Constants.german_sysadmin_no_string()
+
+    check(%Source{code_ast: code_ast}) do
+      {_, no_binary?} =
+        code_ast
+        |> Macro.postwalk(&remove_sigil_c/1)
+        |> Macro.postwalk(true, &no_binary_fun?/2)
+
+      no_binary?
+    end
+  end
+
+  defp remove_sigil_c({:sigil_c, _, _}) do
+    []
+  end
+
+  defp remove_sigil_c(node), do: node
+
+  defp no_binary_fun?({:<<>>, _, _} = node, _) do
+    {node, false}
+  end
+
+  defp no_binary_fun?(node, acc) do
+    {node, acc}
+  end
 end
diff --git a/mix.exs b/mix.exs
@@ -5,7 +5,7 @@ defmodule ElixirAnalyzer.MixProject do
     [
       app: :elixir_analyzer,
       version: "0.1.0",
-      elixir: "~> 1.14",
+      elixir: "~> 1.15",
       elixirc_paths: elixirc_paths(Mix.env()),
       start_permanent: Mix.env() == :prod,
       # Turn off protocol consolidation to avoid warning in analyzed code
diff --git a/mix.lock b/mix.lock
@@ -12,6 +12,6 @@
   "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"},
   "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"},
   "parse_trans": {:hex, :parse_trans, "3.3.1", "16328ab840cc09919bd10dab29e431da3af9e9e7e7e6f0089dd5a2d2820011d8", [:rebar3], [], "hexpm", "07cd9577885f56362d414e8c4c4e6bdf10d43a8767abb92d24cbe8b24c54888b"},
-  "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.6", "cf344f5692c82d2cd7554f5ec8fd961548d4fd09e7d22f5b62482e5aeaebd4b0", [:make, :mix, :rebar3], [], "hexpm", "bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680"},
+  "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.7", "354c321cf377240c7b8716899e182ce4890c5938111a1296add3ec74cf1715df", [], [], "hexpm", "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
 }
diff --git a/test/elixir_analyzer/cli_test.exs b/test/elixir_analyzer/cli_test.exs
@@ -43,7 +43,7 @@ defmodule ElixirAnalyzer.CLITest do
 
   defp match_submission(_), do: false
 
-  @lasagna_result "{\"comments\":[{\"comment\":\"elixir.solution.same_as_exemplar\",\"type\":\"celebratory\"}],\"summary\":\"You're doing something right. 🎉\"}"
+  @lasagna_result "{\"comments\":[{\"type\":\"celebratory\",\"comment\":\"elixir.solution.same_as_exemplar\"}],\"summary\":\"You're doing something right. 🎉\"}"
 
   setup do
     on_exit(fn ->
diff --git a/test/elixir_analyzer/constants_test.exs b/test/elixir_analyzer/constants_test.exs
@@ -30,13 +30,13 @@ defmodule ElixirAnalyzer.ConstantsTest do
 
         {status, status_msg} = get_comment_with_retry_on_rate_limit_error(request_url)
 
-        assert {status, status_msg, @comment} == {200, 'OK', @comment}
+        assert {status, status_msg, @comment} == {200, ~c"OK", @comment}
       end
     end
   end
 
   defp get_comment_with_retry_on_rate_limit_error(request_url) do
-    {:ok, {{'HTTP/1.1', status, status_msg}, _headers, _body}} =
+    {:ok, {{~c"HTTP/1.1", status, status_msg}, _headers, _body}} =
       :httpc.request(:head, {request_url, []}, [], [])
 
     if status == 429 do
diff --git a/test/elixir_analyzer/exercise_test/check_source_test.exs b/test/elixir_analyzer/exercise_test/check_source_test.exs
@@ -71,19 +71,19 @@ defmodule ElixirAnalyzer.ExerciseTest.CheckSourceTest do
         end
       end
       ''',
-      ~S"""
+      ~S'''
       defmodule CheckSourceVerification do
         def foo do
-          '''
+          ~c"""
           love
           is
           all
           you
           need
-          '''
+          """
         end
       end
-      """
+      '''
     ]
   end
 
diff --git a/test/elixir_analyzer/test_suite/german_sysadmin_test.exs b/test/elixir_analyzer/test_suite/german_sysadmin_test.exs
@@ -6,20 +6,20 @@ defmodule ElixirAnalyzer.ExerciseTest.GermanSysadminTest do
     comments: [ElixirAnalyzer.Constants.solution_same_as_exemplar()] do
     ~S"""
     defmodule Username do
-      def sanitize('') do
-        ''
+      def sanitize(~c"") do
+        ~c""
       end
 
       def sanitize([head | tail]) do
         sanitized =
           case head do
-            ?ß -> 'ss'
-            ?ä -> 'ae'
-            ?ö -> 'oe'
-            ?ü -> 'ue'
+            ?ß -> ~c"ss"
+            ?ä -> ~c"ae"
+            ?ö -> ~c"oe"
+            ?ü -> ~c"ue"
             x when x >= ?a and x <= ?z -> [x]
-            ?_ -> '_'
-            _ -> ''
+            ?_ -> ~c"_"
+            _ -> ~c""
           end
 
         sanitized ++ sanitize(tail)
@@ -36,13 +36,13 @@ defmodule ElixirAnalyzer.ExerciseTest.GermanSysadminTest do
         List.foldr(list, [], fn code, acc ->
           sanitized =
             case code do
-              ?ß -> 'ss'
-              ?ä -> 'ae'
-              ?ö -> 'oe'
-              ?ü -> 'ue'
+              ?ß -> ~c"ss"
+              ?ä -> ~c"ae"
+              ?ö -> ~c"oe"
+              ?ü -> ~c"ue"
               x when x >= ?a and x <= ?z -> [x]
-              ?_ -> '_'
-              _ -> ''
+              ?_ -> ~c"_"
+              _ -> ~c""
             end
 
           sanitized ++ acc
@@ -194,20 +194,20 @@ defmodule ElixirAnalyzer.ExerciseTest.GermanSysadminTest do
   end
 
   test_exercise_analysis "valid solution without quoting triggers comment",
-    # This is because Elixir's ASTs don't differentiate between code points like ?ß and integers 
+    # This is because Elixir's ASTs don't differentiate between code points like ?ß and integers
     comments: [Constants.solution_no_integer_literal()] do
     defmodule Username do
       def sanitize(list) do
         List.foldr(list, [], fn code, acc ->
           sanitized =
             case code do
-              ?ß -> 'ss'
-              ?ä -> 'ae'
-              ?ö -> 'oe'
-              ?ü -> 'ue'
+              ?ß -> ~c"ss"
+              ?ä -> ~c"ae"
+              ?ö -> ~c"oe"
+              ?ü -> ~c"ue"
               x when x >= ?a and x <= ?z -> [x]
-              ?_ -> '_'
-              _ -> ''
+              ?_ -> ~c"_"
+              _ -> ~c""
             end
 
           sanitized ++ acc
diff --git a/test/elixir_analyzer/test_suite/guessing_game_test.exs b/test/elixir_analyzer/test_suite/guessing_game_test.exs
@@ -85,7 +85,7 @@ defmodule ElixirAnalyzer.ExerciseTest.GuessingGameTest do
         end
       end,
       defmodule GuessingGame do
-        def compare(secret_number, guess \\ '')
+        def compare(secret_number, guess \\ ~c"")
         def compare(_, guess) when not is_number(guess), do: "Make a guess"
         def compare(secret_number, guess) when secret_number == guess, do: "Correct"
         def compare(secret_number, guess) when abs(secret_number - guess) <= 1, do: "So close"
diff --git a/test/elixir_analyzer_test.exs b/test/elixir_analyzer_test.exs
diff --git a/test_data/lasagna/deprecated_modules/expected_analysis.json b/test_data/lasagna/deprecated_modules/expected_analysis.json

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`import Config`
`2`	`2`
`3`		`-config :logger, level: :warn`
	`3`	`+config :logger, level: :warning`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ defmodule ElixirAnalyzer.MixProject do`
`5`	`5`	`[`
`6`	`6`	`app: :elixir_analyzer,`
`7`	`7`	`version: "0.1.0",`
`8`		`- elixir: "~> 1.14",`
	`8`	`+ elixir: "~> 1.15",`
`9`	`9`	`elixirc_paths: elixirc_paths(Mix.env()),`
`10`	`10`	`start_permanent: Mix.env() == :prod,`
`11`	`11`	`# Turn off protocol consolidation to avoid warning in analyzed code`