From 20e13e01dbb2ef060ce128956d16afccd344dfd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonatan=20K=C5=82osko?= Date: Mon, 19 Jun 2023 18:21:55 +0200 Subject: [PATCH] Bump to Elixir 1.15 (#1989) --- lib/livebook/intellisense.ex | 12 +++++------- test/livebook/runtime/evaluator_test.exs | 2 -- versions | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/lib/livebook/intellisense.ex b/lib/livebook/intellisense.ex index c72f306eb..0433ae989 100644 --- a/lib/livebook/intellisense.ex +++ b/lib/livebook/intellisense.ex @@ -534,14 +534,12 @@ defmodule Livebook.Intellisense do name -> name end - # TODO: remove the first check on Elixir v1.15.0 is_otp? = - app == :erts or - case :code.which(app || module) do - :preloaded -> true - [_ | _] = path -> List.starts_with?(path, :code.lib_dir()) - _ -> false - end + case :code.which(app || module) do + :preloaded -> true + [_ | _] = path -> List.starts_with?(path, :code.lib_dir()) + _ -> false + end cond do is_otp? -> diff --git a/test/livebook/runtime/evaluator_test.exs b/test/livebook/runtime/evaluator_test.exs index 2c29fbe9a..1b7171d5d 100644 --- a/test/livebook/runtime/evaluator_test.exs +++ b/test/livebook/runtime/evaluator_test.exs @@ -505,8 +505,6 @@ defmodule Livebook.Runtime.EvaluatorTest do %{column: 4, details: _, end_line: 20, line: 19, status: :failed}} end - # TODO: Run this test on Elixir v1.15+ - @tag :skip test "multiple assertions at once", %{evaluator: evaluator} do code = ~S''' defmodule Livebook.Runtime.EvaluatorTest.DoctestsMiddle do diff --git a/versions b/versions index 1a378f1ff..77aa1269a 100644 --- a/versions +++ b/versions @@ -1,4 +1,4 @@ -elixir="1.15.0-rc.2" +elixir="1.15.0" otp="25.3.2" openssl="1.1.1s" rebar3="3.22.0"