Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-24 16:23:40 +01:00
Code Releases Activity

Update Jose to the new 1.11.10 for Erlang/OTP > 23

Browse Source
This commit is contained in:
Badlop 2024-04-08 10:46:14 +02:00
parent 44bafa478e
commit ee9d4d56a9
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/runtime.yml vendored
View File

@ -329,6 +329,11 @@ jobs:
sed -i 's|^{deps, \(.*\)|{deps, \1\n {decimal, ".*", {git, "https://github.com/ericmj/decimal", {branch, "main"}}}, |g' rebar.config sed -i 's|^{deps, \(.*\)|{deps, \1\n {decimal, ".*", {git, "https://github.com/ericmj/decimal", {branch, "main"}}}, |g' rebar.config
cat rebar.config cat rebar.config
- name: Unlock Jose dependency on older Erlang
if: matrix.otp < 24
run: |
mix deps.unlock jose
- name: Compile - name: Compile
run: | run: |
./autogen.sh ./autogen.sh

3
mix.exs
View File

@ -138,7 +138,6 @@ defmodule Ejabberd.MixProject do
{:fast_yaml, "~> 1.0"}, {:fast_yaml, "~> 1.0"},
{:idna, "~> 6.0"}, {:idna, "~> 6.0"},
{:jiffy, "~> 1.1.1"}, {:jiffy, "~> 1.1.1"},
{:jose, "~> 1.11.5"},
{:mqtree, "~> 1.0"}, {:mqtree, "~> 1.0"},
{:p1_acme, "~> 1.0"}, {:p1_acme, "~> 1.0"},
{:p1_oauth2, "~> 0.6"}, {:p1_oauth2, "~> 0.6"},
@ -168,6 +167,8 @@ defmodule Ejabberd.MixProject do
{config(:redis), {:eredis, "~> 1.2.0"}}, {config(:redis), {:eredis, "~> 1.2.0"}},
{config(:sip), {:esip, "~> 1.0"}}, {config(:sip), {:esip, "~> 1.0"}},
{config(:zlib), {:ezlib, "~> 1.0"}}, {config(:zlib), {:ezlib, "~> 1.0"}},
{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"}}, {if_version_below(~c"22", true), {:lager, "~> 3.9.1"}},
{config(:lua) and if_version_below(~c"27", true), {config(:lua) and if_version_below(~c"27", true),
{:luerl, "~> 1.1.1"}}, {:luerl, "~> 1.1.1"}},

4
rebar.config
View File

@ -44,8 +44,8 @@
{jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "1.1.1"}}}, {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "1.1.1"}}},
{jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "1.1.0"}}} % for R19 and below {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "1.1.0"}}} % for R19 and below
}, },
{if_version_above, "20", {if_version_above, "23",
{jose, ".*", {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.11.5"}}}, {jose, ".*", {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.11.10"}}},
{jose, ".*", {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.11.1"}}} {jose, ".*", {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.11.1"}}}
}, },
{if_version_below, "22", {if_version_below, "22",