diff --git a/mix.exs b/mix.exs index 3589a323f..a97b61443 100644 --- a/mix.exs +++ b/mix.exs @@ -170,10 +170,7 @@ defmodule Ejabberd.MixProject do {if_version_above(~c"23", true), {:jose, "~> 1.11.10"}}, {if_version_below(~c"24", true), {:jose, "1.11.1"}}, {if_version_below(~c"22", true), {:lager, "~> 3.9.1"}}, - {config(:lua) and if_version_below(~c"27", true), - {:luerl, "~> 1.1.1"}}, - {config(:lua) and if_version_above(~c"26", true), - {:luerl, git: "https://github.com/processone/luerl", branch: "otp27"}}, + {config(:lua), {:luerl, "~> 1.2.0"}}, {config(:mysql), {:p1_mysql, ">= 1.0.23" }}, {config(:pgsql), {:p1_pgsql, "~> 1.1"}}, {config(:sqlite), {:sqlite3, "~> 1.1"}}, diff --git a/rebar.config b/rebar.config index e2c58cfb1..bacf4a79c 100644 --- a/rebar.config +++ b/rebar.config @@ -51,27 +51,10 @@ {if_version_below, "22", {lager, "~> 3.9.1", {git, "https://github.com/erlang-lager/lager", {tag, "3.9.1"}}} }, - %% Lua, rebar, OTP 20: 1.0 git tag {if_var_true, lua, - {if_not_rebar3, - {if_version_below, "21", - {luerl, "1.0", {git, "https://github.com/rvirding/luerl", {tag, "1.0"}}} - }}}, - %% Lua, rebar3, OTP 20: 1.0.0 hex package - {if_var_true, lua, - {if_rebar3, - {if_version_below, "21", - {luerl, "1.0.0", {git, "https://github.com/rvirding/luerl", {tag, "1.0.0"}}} - }}}, - %% Lua, any rebar, OTP 21-26: 1.1.1 git tag / 1.1.1 hex package - {if_var_true, lua, - {if_version_above, "20", {if_version_below, "27", - {luerl, "~> 1.1.1", {git, "https://github.com/rvirding/luerl", {tag, "1.1.1"}}} - }}}, - %% Lua, any rebar, OTP 27: temporary otp27 branch from fork - {if_var_true, lua, - {if_version_above, "26", - {luerl, ".*", {git, "https://github.com/processone/luerl", {branch, "otp27"}}} + {if_version_below, "21", + {luerl, "1.0.0", {git, "https://github.com/rvirding/luerl", {tag, "1.0"}}}, + {luerl, "~> 1.2.0", {git, "https://github.com/rvirding/luerl", {tag, "1.2"}}} }}, {mqtree, "~> 1.0.16", {git, "https://github.com/processone/mqtree", {tag, "1.0.16"}}}, {p1_acme, ".*", {git, "https://github.com/processone/p1_acme", {branch, "master"}}},