From 4f18d2ddad23040931c8fc6d495cdff9f4023b2d Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Wed, 17 May 2023 04:56:51 -0600
Subject: [PATCH 1/2] move to testing on otp 26, 25, 24

---
 .github/workflows/main.yml      | 2 +-
 .github/workflows/shelltest.yml | 2 +-
 .github/workflows/wintest.yml   | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7864b457a..b786d4a38 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        otp_version: [22, 23, 24, 25]
+        otp_version: [23, 24, 26]
         os: [ubuntu-20.04] # latest only runs >= 24.2
 
     container:
diff --git a/.github/workflows/shelltest.yml b/.github/workflows/shelltest.yml
index 13eca1324..759460e9b 100644
--- a/.github/workflows/shelltest.yml
+++ b/.github/workflows/shelltest.yml
@@ -17,7 +17,7 @@ jobs:
       matrix:
         # TODO: make a batch of tests that runs on nodetool rather
         #       than the new connectivity mechanism
-        otp_version: [24, 25]
+        otp_version: [25, 26]
         os: [ubuntu-latest] # latest only runs >= 24.2
 
     steps:
diff --git a/.github/workflows/wintest.yml b/.github/workflows/wintest.yml
index 9a8ff86dd..dcc0259df 100644
--- a/.github/workflows/wintest.yml
+++ b/.github/workflows/wintest.yml
@@ -15,8 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        # Cannot test OTP 21 due to https://bugs.erlang.org/browse/ERL-644 (see also https://github.com/elixir-lang/elixir/issues/7774)
-        otp_version: [22, 23, 24, 25]
+        otp_version: [24, 25, 26]
         os: [windows-latest]
 
     steps:

From bb4f4d77398e36313c4dcf366e137677480b8833 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Wed, 17 May 2023 10:44:02 -0600
Subject: [PATCH 2/2] updates for dialyzer unknown and OTP-26 changes

---
 src/relx.app.src     |  4 +++-
 src/rlx_assemble.erl | 10 +++++-----
 src/rlx_util.erl     |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/relx.app.src b/src/relx.app.src
index 5b4a4467f..aee41984a 100644
--- a/src/relx.app.src
+++ b/src/relx.app.src
@@ -5,6 +5,8 @@
   {registered, []},
   {applications, [kernel,
                   stdlib,
-                  bbmustache]},
+                  bbmustache,
+                  sasl,
+                  tools]},
   {licenses, ["Apache-2.0"]},
   {links, [{"Github", "https://github.com/erlware/relx"}]}]}.
diff --git a/src/rlx_assemble.erl b/src/rlx_assemble.erl
index 0b7c6b265..aec6ee786 100644
--- a/src/rlx_assemble.erl
+++ b/src/rlx_assemble.erl
@@ -759,7 +759,7 @@ maybe_check_for_undefined_functions_(State, Release) ->
                     FilterMethod = rlx_state:filter_xref_warning(State),
                     FilteredWarnings = FilterMethod(Warnings),
                     format_xref_warning(FilteredWarnings);
-                {error, _} = Error ->
+                {error, _, _} = Error ->
                     ?log_warn(
                         "Error running xref analyze: ~s", 
                         [xref:format_error(Error)])
@@ -776,13 +776,13 @@ add_project_apps_to_xref(Rf, [AppSpec | Rest], State) ->
     case maps:find(element(1, AppSpec), rlx_state:available_apps(State)) of
         {ok, App=#{app_type := project}} ->
             case xref:add_application(
-                    Rf,
-                    rlx_app_info:dir(App),
-                    [{name, rlx_app_info:name(App)}, {warnings, false}]) 
+                   Rf,
+                   binary_to_list(rlx_app_info:dir(App)),
+                   [{name, rlx_app_info:name(App)}, {warnings, false}])
             of
                 {ok, _} ->
                     ok;
-                {error, _} = Error ->
+                {error, _, _} = Error ->
                     ?log_warn("Error adding application ~s to xref context: ~s",
                               [rlx_app_info:name(App), xref:format_error(Error)])
             end;
diff --git a/src/rlx_util.erl b/src/rlx_util.erl
index 9047b4b59..349aa7bee 100644
--- a/src/rlx_util.erl
+++ b/src/rlx_util.erl
@@ -104,7 +104,7 @@ parsed_vsn_lt({MMPA, {AlphaA, PatchA}}, {MMPB, {AlphaB, PatchB}}) ->
            PatchA < PatchB))).
 
 %% @doc Generates the correct set of code paths for the system.
--spec get_code_paths(rlx_release:t(), file:name()) -> [filename:filename_all()].
+-spec get_code_paths(rlx_release:t(), file:name()) -> [file:filename_all()].
 get_code_paths(Release, OutDir) ->
     LibDir = filename:join(OutDir, "lib"),
     [filename:join([LibDir, [rlx_app_info:name(App), "-", rlx_app_info:vsn(App)], "ebin"]) ||