Upgrade Elixir to 1.6.6 (#2653)

diff --git a/mix.exs b/mix.exs
index 2e136884d82596ca549c186d158be31788e9add3..8f13482f05a9ef65aa31ccc8e02f69a547135829 100644 (file)
--- a/mix.exs
+++ b/mix.exs
@@ -5,7 +5,7 @@ defmodule Ejabberd.Mixfile do
     [app: :ejabberd,
      version: "18.9.0",
      description: description(),
-     elixir: "~> 1.4",
+     elixir: "~> 1.6",
      elixirc_paths: ["lib"],
      compile_path: ".",
      compilers: [:asn1] ++ Mix.compilers,

diff --git a/rebar.config b/rebar.config
index a87ec0054abdd5702fc63ecd6e414c5625af510a..564018b86d9be8b44b1246cb0fa6c1705bd9dab0 100644 (file)
--- a/rebar.config
+++ b/rebar.config
@@ -47,7 +47,7 @@
                                            {tag, {if_version_above, "19", "develop", "2.5.3"}}}}},
         %% Elixir support, needed to run tests
         {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir",
-                                              {tag, {if_version_above, "17", "v1.4.4", "v1.1.1"}}}}},
+                                              {tag, "v1.6.6"}}}},
         %% TODO: When modules are fully migrated to new structure and mix, we will not need anymore rebar_elixir_plugin
         {if_not_rebar3, {if_var_true, elixir, {rebar_elixir_plugin, ".*",
                                                {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}}},