diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9bd106ed..0c87eaaf3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,15 +16,6 @@ jobs: fail-fast: false matrix: include: - - elixir: 1.12.x - otp: 22.x - tests_may_fail: false - - elixir: 1.12.x - otp: 23.x - tests_may_fail: false - - elixir: 1.12.x - otp: 24.x - tests_may_fail: false - elixir: 1.13.x otp: 22.x tests_may_fail: false @@ -98,12 +89,6 @@ jobs: fail-fast: false matrix: include: - - elixir: 1.12.x - otp: 22.x - - elixir: 1.12.x - otp: 23.x - - elixir: 1.12.x - otp: 24.x - elixir: 1.13.x otp: 22.x - elixir: 1.13.x diff --git a/apps/debug_adapter/mix.exs b/apps/debug_adapter/mix.exs index 3b274f969..18e806d1f 100644 --- a/apps/debug_adapter/mix.exs +++ b/apps/debug_adapter/mix.exs @@ -19,7 +19,7 @@ defmodule ElixirLS.DebugAdapter.MixProject do config_path: "../../config/config.exs", deps_path: "../../deps", lockfile: "../../mix.lock", - elixir: ">= 1.12.0", + elixir: ">= 1.13.0", build_embedded: false, start_permanent: true, build_per_environment: false, diff --git a/apps/elixir_ls_utils/lib/minimum_version.ex b/apps/elixir_ls_utils/lib/minimum_version.ex index 0012783e1..d73d9a5d0 100644 --- a/apps/elixir_ls_utils/lib/minimum_version.ex +++ b/apps/elixir_ls_utils/lib/minimum_version.ex @@ -16,7 +16,7 @@ defmodule ElixirLS.Utils.MinimumVersion do end def check_elixir_version do - if Version.match?(System.version(), ">= 1.12.0") do + if Version.match?(System.version(), ">= 1.13.0") do if Regex.match?(~r/-/, System.version()) do {:error, "Only official elixir releases are supported. (Currently running v#{System.version()})"} @@ -25,7 +25,7 @@ defmodule ElixirLS.Utils.MinimumVersion do end else {:error, - "Elixir versions below 1.12.0 are not supported. (Currently running v#{System.version()})"} + "Elixir versions below 1.13.0 are not supported. (Currently running v#{System.version()})"} end end diff --git a/apps/elixir_ls_utils/mix.exs b/apps/elixir_ls_utils/mix.exs index 517f56f45..c77e10653 100644 --- a/apps/elixir_ls_utils/mix.exs +++ b/apps/elixir_ls_utils/mix.exs @@ -20,7 +20,7 @@ defmodule ElixirLS.Utils.MixProject do deps_path: "../../deps", elixirc_paths: elixirc_paths(Mix.env()), lockfile: "../../mix.lock", - elixir: ">= 1.12.0", + elixir: ">= 1.13.0", build_embedded: false, start_permanent: false, build_per_environment: false, diff --git a/apps/language_server/lib/language_server/ast_utils.ex b/apps/language_server/lib/language_server/ast_utils.ex index c1a9113cc..5aa6006d1 100644 --- a/apps/language_server/lib/language_server/ast_utils.ex +++ b/apps/language_server/lib/language_server/ast_utils.ex @@ -75,7 +75,7 @@ defmodule ElixirLS.LanguageServer.AstUtils do end lines = SourceFile.lines(literal) - # meta[:indentation] is nil on 1.12 + # meta[:indentation] is nil on 1.12, not sure this is needed in 1.13+ indentation = Keyword.get(meta, :indentation, 0) {line + length(lines), indentation + get_delimiter_length(delimiter)} @@ -224,7 +224,7 @@ defmodule ElixirLS.LanguageServer.AstUtils do {last[:line] - 1, last[:column] - 1 + last_length} else - # last is nil on 1.12 + # last is nil on 1.12, not sure this is needed in 1.13+ get_eoe_by_formatting(ast, {line, column}, options) end diff --git a/apps/language_server/mix.exs b/apps/language_server/mix.exs index 6d8642ef9..f463e2752 100644 --- a/apps/language_server/mix.exs +++ b/apps/language_server/mix.exs @@ -15,7 +15,7 @@ defmodule ElixirLS.LanguageServer.MixProject do [ app: :language_server, version: @version, - elixir: ">= 1.12.0", + elixir: ">= 1.13.0", build_path: "../../_build", config_path: "../../config/config.exs", deps_path: "../../deps", diff --git a/mix.exs b/mix.exs index ee1b6cdbc..5950499c8 100644 --- a/mix.exs +++ b/mix.exs @@ -9,7 +9,7 @@ defmodule ElixirLS.Mixfile do start_permanent: Mix.env() == :prod, build_per_environment: false, deps: deps(), - elixir: ">= 1.12.0", + elixir: ">= 1.13.0", dialyzer: [ plt_add_apps: [:dialyxir_vendored, :debugger, :dialyzer, :ex_unit, :hex, :mix], flags: [