From 8d856bff861d8993831270a2fab9af0f06a965b0 Mon Sep 17 00:00:00 2001 From: Metin Akat Date: Sun, 17 Mar 2019 13:19:52 +0200 Subject: [PATCH 1/4] Initial stab at compiling the project with rebar3 --- .gitignore | 2 + .../roster/{ => include}/static/main_text.hrl | 0 apps/roster/{ => include}/static/main_var.hrl | 0 .../{ => include}/static/prometheus_text.hrl | 0 .../{ => include}/static/prometheus_var.hrl | 0 .../static/push_notification_var.hrl | 0 .../roster/{ => include}/static/rest_text.hrl | 0 apps/roster/{ => include}/static/rest_var.hrl | 0 .../static/room_channel_text.hrl | 0 .../{ => include}/static/room_channel_var.hrl | 0 apps/roster/src/api/prometheus_api.erl | 4 +- apps/roster/src/api/push/ios.erl | 2 +- .../src/protocol/channel/roster_channel.erl | 8 +- .../channel/roster_channel_helper.erl | 6 +- .../channel/roster_channel_history.erl | 2 +- .../protocol/channel/roster_channel_link.erl | 6 +- .../channel/roster_channel_member.erl | 6 +- .../channel/roster_channel_message.erl | 6 +- apps/roster/src/protocol/roster_message.erl | 2 +- apps/roster/src/protocol/roster_room.erl | 2 +- apps/roster/src/rest/admin_whitelist.erl | 2 +- .../src/rest/helpers/rest_main_helper.erl | 4 +- .../src/rest/helpers/rest_response_helper.erl | 4 +- apps/roster/src/rest/rest_cri.erl | 10 +- apps/roster/src/rest/rest_deeplink.erl | 2 +- apps/roster/src/rest/rest_fake_numbers.erl | 2 +- apps/roster/src/rest/rest_handler.erl | 4 +- apps/roster/src/rest/rest_metric.erl | 4 +- apps/roster/src/rest/rest_publish.erl | 4 +- apps/roster/src/rest/rest_push.erl | 2 +- apps/roster/src/rest/rest_session.erl | 2 +- apps/roster/src/rest/rest_users.erl | 8 +- apps/roster/src/rest/rest_whitelist.erl | 2 +- apps/roster/src/roster.erl | 4 +- apps/service/include/auth.hrl | 1 + rebar.config | 6 +- rebar.lock | 180 ++++++++++++++++++ 37 files changed, 235 insertions(+), 52 deletions(-) rename apps/roster/{ => include}/static/main_text.hrl (100%) rename apps/roster/{ => include}/static/main_var.hrl (100%) rename apps/roster/{ => include}/static/prometheus_text.hrl (100%) rename apps/roster/{ => include}/static/prometheus_var.hrl (100%) rename apps/roster/{ => include}/static/push_notification_var.hrl (100%) rename apps/roster/{ => include}/static/rest_text.hrl (100%) rename apps/roster/{ => include}/static/rest_var.hrl (100%) rename apps/roster/{ => include}/static/room_channel_text.hrl (100%) rename apps/roster/{ => include}/static/room_channel_var.hrl (100%) create mode 100644 rebar.lock diff --git a/.gitignore b/.gitignore index 3470d5b8b..2bb7aeef6 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,8 @@ sample vcs.xml workspace.xml .idea/ +.DS_Store +_build # Excessive for iOS models apps/roster/priv/macbert/Model/PublishService.swift diff --git a/apps/roster/static/main_text.hrl b/apps/roster/include/static/main_text.hrl similarity index 100% rename from apps/roster/static/main_text.hrl rename to apps/roster/include/static/main_text.hrl diff --git a/apps/roster/static/main_var.hrl b/apps/roster/include/static/main_var.hrl similarity index 100% rename from apps/roster/static/main_var.hrl rename to apps/roster/include/static/main_var.hrl diff --git a/apps/roster/static/prometheus_text.hrl b/apps/roster/include/static/prometheus_text.hrl similarity index 100% rename from apps/roster/static/prometheus_text.hrl rename to apps/roster/include/static/prometheus_text.hrl diff --git a/apps/roster/static/prometheus_var.hrl b/apps/roster/include/static/prometheus_var.hrl similarity index 100% rename from apps/roster/static/prometheus_var.hrl rename to apps/roster/include/static/prometheus_var.hrl diff --git a/apps/roster/static/push_notification_var.hrl b/apps/roster/include/static/push_notification_var.hrl similarity index 100% rename from apps/roster/static/push_notification_var.hrl rename to apps/roster/include/static/push_notification_var.hrl diff --git a/apps/roster/static/rest_text.hrl b/apps/roster/include/static/rest_text.hrl similarity index 100% rename from apps/roster/static/rest_text.hrl rename to apps/roster/include/static/rest_text.hrl diff --git a/apps/roster/static/rest_var.hrl b/apps/roster/include/static/rest_var.hrl similarity index 100% rename from apps/roster/static/rest_var.hrl rename to apps/roster/include/static/rest_var.hrl diff --git a/apps/roster/static/room_channel_text.hrl b/apps/roster/include/static/room_channel_text.hrl similarity index 100% rename from apps/roster/static/room_channel_text.hrl rename to apps/roster/include/static/room_channel_text.hrl diff --git a/apps/roster/static/room_channel_var.hrl b/apps/roster/include/static/room_channel_var.hrl similarity index 100% rename from apps/roster/static/room_channel_var.hrl rename to apps/roster/include/static/room_channel_var.hrl diff --git a/apps/roster/src/api/prometheus_api.erl b/apps/roster/src/api/prometheus_api.erl index 49f7b7231..fb4a5f9d5 100644 --- a/apps/roster/src/api/prometheus_api.erl +++ b/apps/roster/src/api/prometheus_api.erl @@ -2,8 +2,8 @@ %% Prometheus metrics declaration module -module(prometheus_api). --include_lib("roster/static/prometheus_text.hrl"). --include_lib("roster/static/prometheus_var.hrl"). +-include_lib("roster/include/static/prometheus_text.hrl"). +-include_lib("roster/include/static/prometheus_var.hrl"). -export([init/0]). diff --git a/apps/roster/src/api/push/ios.erl b/apps/roster/src/api/push/ios.erl index 71e9d8b09..ef79bee09 100644 --- a/apps/roster/src/api/push/ios.erl +++ b/apps/roster/src/api/push/ios.erl @@ -1,6 +1,6 @@ -module(ios). -include("roster.hrl"). --include_lib("roster/static/push_notification_var.hrl"). +-include_lib("roster/include/static/push_notification_var.hrl"). -export([description/0, notify/5, test_push_notification/0]). diff --git a/apps/roster/src/protocol/channel/roster_channel.erl b/apps/roster/src/protocol/channel/roster_channel.erl index 4fa3e7a8e..9b2f984ad 100644 --- a/apps/roster/src/protocol/channel/roster_channel.erl +++ b/apps/roster/src/protocol/channel/roster_channel.erl @@ -1,9 +1,9 @@ -module(roster_channel). -include("roster.hrl"). --include_lib("roster/static/room_channel_text.hrl"). --include_lib("roster/static/room_channel_var.hrl"). --include_lib("roster/static/main_text.hrl"). --include_lib("roster/static/main_var.hrl"). +-include_lib("roster/include/static/room_channel_text.hrl"). +-include_lib("roster/include/static/room_channel_var.hrl"). +-include_lib("roster/include/static/main_text.hrl"). +-include_lib("roster/include/static/main_var.hrl"). -include_lib("n2o/include/n2o.hrl"). -compile(export_all). diff --git a/apps/roster/src/protocol/channel/roster_channel_helper.erl b/apps/roster/src/protocol/channel/roster_channel_helper.erl index ec7f7d7e7..f0d531f66 100644 --- a/apps/roster/src/protocol/channel/roster_channel_helper.erl +++ b/apps/roster/src/protocol/channel/roster_channel_helper.erl @@ -1,8 +1,8 @@ -module(roster_channel_helper). -include("roster.hrl"). --include_lib("roster/static/room_channel_text.hrl"). --include_lib("roster/static/room_channel_var.hrl"). --include_lib("roster/static/main_text.hrl"). +-include_lib("roster/include/static/room_channel_text.hrl"). +-include_lib("roster/include/static/room_channel_var.hrl"). +-include_lib("roster/include/static/main_text.hrl"). -compile(export_all). %% --------------------------------------------------------------------------------------------------------------------- diff --git a/apps/roster/src/protocol/channel/roster_channel_history.erl b/apps/roster/src/protocol/channel/roster_channel_history.erl index 3bdc6e3b3..d5de8c7af 100644 --- a/apps/roster/src/protocol/channel/roster_channel_history.erl +++ b/apps/roster/src/protocol/channel/roster_channel_history.erl @@ -1,6 +1,6 @@ -module(roster_channel_history). -include("roster.hrl"). --include_lib("roster/static/main_text.hrl"). +-include_lib("roster/include/static/main_text.hrl"). -include_lib("n2o/include/n2o.hrl"). -compile(export_all). diff --git a/apps/roster/src/protocol/channel/roster_channel_link.erl b/apps/roster/src/protocol/channel/roster_channel_link.erl index 1be559dbf..a5b427387 100644 --- a/apps/roster/src/protocol/channel/roster_channel_link.erl +++ b/apps/roster/src/protocol/channel/roster_channel_link.erl @@ -1,8 +1,8 @@ -module(roster_channel_link). -include("roster.hrl"). --include_lib("roster/static/room_channel_text.hrl"). --include_lib("roster/static/room_channel_var.hrl"). --include_lib("roster/static/main_text.hrl"). +-include_lib("roster/include/static/room_channel_text.hrl"). +-include_lib("roster/include/static/room_channel_var.hrl"). +-include_lib("roster/include/static/main_text.hrl"). -include_lib("n2o/include/n2o.hrl"). -compile(export_all). diff --git a/apps/roster/src/protocol/channel/roster_channel_member.erl b/apps/roster/src/protocol/channel/roster_channel_member.erl index 2e850e2cf..92b2b9644 100644 --- a/apps/roster/src/protocol/channel/roster_channel_member.erl +++ b/apps/roster/src/protocol/channel/roster_channel_member.erl @@ -1,8 +1,8 @@ -module(roster_channel_member). -include("roster.hrl"). --include_lib("roster/static/room_channel_text.hrl"). --include_lib("roster/static/room_channel_var.hrl"). --include_lib("roster/static/main_text.hrl"). +-include_lib("roster/include/static/room_channel_text.hrl"). +-include_lib("roster/include/static/room_channel_var.hrl"). +-include_lib("roster/include/static/main_text.hrl"). -include_lib("n2o/include/n2o.hrl"). -compile(export_all). diff --git a/apps/roster/src/protocol/channel/roster_channel_message.erl b/apps/roster/src/protocol/channel/roster_channel_message.erl index 1d348dedb..8650a2bcf 100644 --- a/apps/roster/src/protocol/channel/roster_channel_message.erl +++ b/apps/roster/src/protocol/channel/roster_channel_message.erl @@ -1,8 +1,8 @@ -module(roster_channel_message). -include("roster.hrl"). --include_lib("roster/static/room_channel_text.hrl"). --include_lib("roster/static/room_channel_var.hrl"). --include_lib("roster/static/main_text.hrl"). +-include_lib("roster/include/static/room_channel_text.hrl"). +-include_lib("roster/include/static/room_channel_var.hrl"). +-include_lib("roster/include/static/main_text.hrl"). -include_lib("n2o/include/n2o.hrl"). -compile(export_all). diff --git a/apps/roster/src/protocol/roster_message.erl b/apps/roster/src/protocol/roster_message.erl index e32320da5..a73ebabff 100644 --- a/apps/roster/src/protocol/roster_message.erl +++ b/apps/roster/src/protocol/roster_message.erl @@ -2,7 +2,7 @@ -include("roster.hrl"). -include_lib("n2o/include/n2o.hrl"). -include_lib("kvs/include/kvs.hrl"). --include_lib("roster/static/rest_text.hrl"). +-include_lib("roster/include/static/rest_text.hrl"). -compile(export_all). -define(TIMEOUT, {1, {0, 0, 0}}). diff --git a/apps/roster/src/protocol/roster_room.erl b/apps/roster/src/protocol/roster_room.erl index 432b3f61c..ee20e2b6f 100644 --- a/apps/roster/src/protocol/roster_room.erl +++ b/apps/roster/src/protocol/roster_room.erl @@ -1,7 +1,7 @@ -module(roster_room). -include("roster.hrl"). -include_lib("n2o/include/n2o.hrl"). --include_lib("roster/static/room_channel_text.hrl"). +-include_lib("roster/include/static/room_channel_text.hrl"). -compile(export_all). -define(MAX_ROOM_LENGTH, 32). diff --git a/apps/roster/src/rest/admin_whitelist.erl b/apps/roster/src/rest/admin_whitelist.erl index 0e78e6be2..6df46ca44 100644 --- a/apps/roster/src/rest/admin_whitelist.erl +++ b/apps/roster/src/rest/admin_whitelist.erl @@ -1,6 +1,6 @@ -module(admin_whitelist). -include("roster.hrl"). --include_lib("roster/static/rest_var.hrl"). +-include_lib("roster/include/static/rest_var.hrl"). -compile({parse_transform, lager_transform}). -export([handle_request/3]). diff --git a/apps/roster/src/rest/helpers/rest_main_helper.erl b/apps/roster/src/rest/helpers/rest_main_helper.erl index ad40adc8a..6b27fe9b9 100644 --- a/apps/roster/src/rest/helpers/rest_main_helper.erl +++ b/apps/roster/src/rest/helpers/rest_main_helper.erl @@ -1,8 +1,8 @@ -module(rest_main_helper). -include("rest_static.hrl"). -include("roster.hrl"). --include_lib("roster/static/rest_text.hrl"). --include_lib("roster/static/rest_var.hrl"). +-include_lib("roster/include/static/rest_text.hrl"). +-include_lib("roster/include/static/rest_var.hrl"). -include_lib("n2o/include/n2o.hrl"). -export([ description/0, diff --git a/apps/roster/src/rest/helpers/rest_response_helper.erl b/apps/roster/src/rest/helpers/rest_response_helper.erl index b37e074d2..3fc70cc5e 100644 --- a/apps/roster/src/rest/helpers/rest_response_helper.erl +++ b/apps/roster/src/rest/helpers/rest_response_helper.erl @@ -1,6 +1,6 @@ -module(rest_response_helper). --include_lib("roster/static/rest_text.hrl"). --include_lib("roster/static/rest_var.hrl"). +-include_lib("roster/include/static/rest_text.hrl"). +-include_lib("roster/include/static/rest_var.hrl"). -export([ description/0, diff --git a/apps/roster/src/rest/rest_cri.erl b/apps/roster/src/rest/rest_cri.erl index 2c7c427dc..932e5826e 100644 --- a/apps/roster/src/rest/rest_cri.erl +++ b/apps/roster/src/rest/rest_cri.erl @@ -2,11 +2,11 @@ -compile({parse_transform, lager_transform}). -include("roster.hrl"). -include("rest_static.hrl"). --include_lib("roster/static/rest_var.hrl"). --include_lib("roster/static/rest_text.hrl"). --include_lib("roster/static/room_channel_text.hrl"). --include_lib("roster/static/room_channel_var.hrl"). --include_lib("roster/static/main_var.hrl"). +-include_lib("roster/include/static/rest_var.hrl"). +-include_lib("roster/include/static/rest_text.hrl"). +-include_lib("roster/include/static/room_channel_text.hrl"). +-include_lib("roster/include/static/room_channel_var.hrl"). +-include_lib("roster/include/static/main_var.hrl"). -export([ description/0, diff --git a/apps/roster/src/rest/rest_deeplink.erl b/apps/roster/src/rest/rest_deeplink.erl index e2181b1a9..9037234e5 100644 --- a/apps/roster/src/rest/rest_deeplink.erl +++ b/apps/roster/src/rest/rest_deeplink.erl @@ -2,7 +2,7 @@ -compile({parse_transform, lager_transform}). -include("roster.hrl"). -include("rest_static.hrl"). --include_lib("roster/static/rest_var.hrl"). +-include_lib("roster/include/static/rest_var.hrl"). -export([handle_request/3]). diff --git a/apps/roster/src/rest/rest_fake_numbers.erl b/apps/roster/src/rest/rest_fake_numbers.erl index 91ca37107..fa030dfa1 100644 --- a/apps/roster/src/rest/rest_fake_numbers.erl +++ b/apps/roster/src/rest/rest_fake_numbers.erl @@ -1,6 +1,6 @@ -module(rest_fake_numbers). -include("roster.hrl"). --include_lib("roster/static/rest_var.hrl"). +-include_lib("roster/include/static/rest_var.hrl"). -compile({parse_transform, lager_transform}). -export([handle_request/3]). diff --git a/apps/roster/src/rest/rest_handler.erl b/apps/roster/src/rest/rest_handler.erl index 987856a31..6a4375066 100644 --- a/apps/roster/src/rest/rest_handler.erl +++ b/apps/roster/src/rest/rest_handler.erl @@ -1,7 +1,7 @@ -module(rest_handler). -compile({parse_transform, lager_transform}). --include_lib("roster/static/rest_text.hrl"). --include_lib("roster/static/rest_var.hrl"). +-include_lib("roster/include/static/rest_text.hrl"). +-include_lib("roster/include/static/rest_var.hrl"). -export([init/0, handle_request/1, binary_join/2, c_tpl/0, c_tpl/1, c_tpl/2, docroot/0]). %% TODO fix with wait() diff --git a/apps/roster/src/rest/rest_metric.erl b/apps/roster/src/rest/rest_metric.erl index 07c2aefc0..efd80c294 100644 --- a/apps/roster/src/rest/rest_metric.erl +++ b/apps/roster/src/rest/rest_metric.erl @@ -1,8 +1,8 @@ -module(rest_metric). -compile({parse_transform, lager_transform}). -include("roster.hrl"). --include_lib("roster/static/prometheus_var.hrl"). --include_lib("roster/static/rest_var.hrl"). +-include_lib("roster/include/static/prometheus_var.hrl"). +-include_lib("roster/include/static/rest_var.hrl"). -export([handle_request/3]). diff --git a/apps/roster/src/rest/rest_publish.erl b/apps/roster/src/rest/rest_publish.erl index b0efddb1d..e4c146470 100644 --- a/apps/roster/src/rest/rest_publish.erl +++ b/apps/roster/src/rest/rest_publish.erl @@ -1,8 +1,8 @@ -module(rest_publish). -compile({parse_transform, lager_transform}). -include("roster.hrl"). --include_lib("roster/static/rest_text.hrl"). --include_lib("roster/static/rest_var.hrl"). +-include_lib("roster/include/static/rest_text.hrl"). +-include_lib("roster/include/static/rest_var.hrl"). -export([description/0, handle_request/3]). description() -> "Publish any message to the topic". diff --git a/apps/roster/src/rest/rest_push.erl b/apps/roster/src/rest/rest_push.erl index 79d004239..21fb0cf1c 100644 --- a/apps/roster/src/rest/rest_push.erl +++ b/apps/roster/src/rest/rest_push.erl @@ -1,7 +1,7 @@ -module(rest_push). -compile({parse_transform, lager_transform}). -include("roster.hrl"). --include_lib("roster/static/rest_var.hrl"). +-include_lib("roster/include/static/rest_var.hrl"). -export([handle_request/3]). %% NOTE! Link for API design https://nynjadev.atlassian.net/wiki/spaces/SER/pages/119799882/REST+API diff --git a/apps/roster/src/rest/rest_session.erl b/apps/roster/src/rest/rest_session.erl index 5c1aa540f..2563aafbf 100644 --- a/apps/roster/src/rest/rest_session.erl +++ b/apps/roster/src/rest/rest_session.erl @@ -1,7 +1,7 @@ -module(rest_session). -compile({parse_transform, lager_transform}). -include("roster.hrl"). --include_lib("roster/static/rest_var.hrl"). +-include_lib("roster/include/static/rest_var.hrl"). -export([ description/0, diff --git a/apps/roster/src/rest/rest_users.erl b/apps/roster/src/rest/rest_users.erl index 6164df2c7..ff01a429b 100644 --- a/apps/roster/src/rest/rest_users.erl +++ b/apps/roster/src/rest/rest_users.erl @@ -2,10 +2,10 @@ -compile({parse_transform, lager_transform}). -include("roster.hrl"). -include("rest_static.hrl"). --include_lib("roster/static/rest_text.hrl"). --include_lib("roster/static/room_channel_text.hrl"). --include_lib("roster/static/room_channel_var.hrl"). --include_lib("roster/static/main_var.hrl"). +-include_lib("roster/include/static/rest_text.hrl"). +-include_lib("roster/include/static/room_channel_text.hrl"). +-include_lib("roster/include/static/room_channel_var.hrl"). +-include_lib("roster/include/static/main_var.hrl"). -export([ description/0, diff --git a/apps/roster/src/rest/rest_whitelist.erl b/apps/roster/src/rest/rest_whitelist.erl index 4e94579b5..40a6699af 100644 --- a/apps/roster/src/rest/rest_whitelist.erl +++ b/apps/roster/src/rest/rest_whitelist.erl @@ -1,6 +1,6 @@ -module(rest_whitelist). -include("roster.hrl"). --include_lib("roster/static/rest_var.hrl"). +-include_lib("roster/include/static/rest_var.hrl"). -compile({parse_transform, lager_transform}). -export([handle_request/3]). diff --git a/apps/roster/src/roster.erl b/apps/roster/src/roster.erl index 82d98c5ea..c562b8d43 100644 --- a/apps/roster/src/roster.erl +++ b/apps/roster/src/roster.erl @@ -10,8 +10,8 @@ -include_lib("kvs/include/group.hrl"). -include_lib("emqttd/include/emqttd.hrl"). -include_lib("mnesia/src/mnesia.hrl"). --include_lib("roster/static/main_var.hrl"). --include_lib("roster/static/rest_text.hrl"). +-include_lib("roster/include/static/main_var.hrl"). +-include_lib("roster/include/static/rest_text.hrl"). -compile({parse_transform, bert_validator}). -define(BPE_SYS_CLIENT, <<"sys_bpe">>). diff --git a/apps/service/include/auth.hrl b/apps/service/include/auth.hrl index 7c8a358b4..0f7aa4717 100644 --- a/apps/service/include/auth.hrl +++ b/apps/service/include/auth.hrl @@ -1,3 +1,4 @@ +-include("feature.hrl"). -ifndef(AUTH_HRL). -define(AUTH_HRL, true). diff --git a/rebar.config b/rebar.config index ccc5e6117..fb8d85b37 100644 --- a/rebar.config +++ b/rebar.config @@ -2,10 +2,10 @@ {lib_dirs,["apps","deps"]}. {deps_dir,"deps"}. {deps, [ - {lager, ".*", {git, "https://github.com/erlang-lager/lager.git","3.6.1"}}, +%% {lager, ".*", {git, "https://github.com/erlang-lager/lager.git", {tag, "3.6.1"}}}, {bert, ".*", {git, "git://github.com/synrc/bert",{tag,"master"}}}, {active, ".*", {git, "git://github.com/synrc/active",{tag,"master"}}}, - {esockd, ".*", {git, "https://github.com/voxoz/esockd",{tag, "a80634b961c315ffe5f020d73236473b53ae5dc9"}}}, + {esockd, ".*", {git, "https://github.com/voxoz/esockd",{ref, "a80634b961c315ffe5f020d73236473b53ae5dc9"}}}, {bpe, ".*", {git, "git://github.com/spawnproc/bpe.git", {tag,"master"}}}, {emqttd, ".*", {git, "git://github.com/synrc/emqttd",{tag,"master"}}}, {n2o, ".*", {git, "git://github.com/synrc/n2o", {tag,"master"}}}, @@ -15,7 +15,7 @@ {gen_smtp, ".*", {git, "git://github.com/ne-luboff/gen_smtp",{tag,"master"}}}, {emq_dashboard, ".*", {git, "git://github.com/ne-luboff/emq_dashboard",{tag,"master"}}}, {'opencensus-erlang', ".*", {git, "https://github.com/voxoz/opencensus-erlang",{tag, "v0.4.0"}}}, - {libphonenumber_erlang, ".*", {git, "https://github.com/cryoflamer/libphonenumber_erlang.git",{tag,"master"}}}, + {libphonenumber_erlang, ".*", {git, "https://github.com/marinakr/libphonenumber_erlang.git",{tag,"master"}}}, {gproc, ".*", {git, "https://github.com/uwiger/gproc","0.6.1"}}, {erlydtl, ".*", {git, "git://github.com/voxoz/erlydtl",{tag,"master"}}}, diff --git a/rebar.lock b/rebar.lock new file mode 100644 index 000000000..7f34da057 --- /dev/null +++ b/rebar.lock @@ -0,0 +1,180 @@ +{"1.1.0", +[{<<"active">>, + {git,"git://github.com/synrc/active", + {ref,"03df4ac2f154711c3cab46a10ad3577cf19436e5"}}, + 0}, + {<<"base64url">>, + {git,"https://github.com/dvv/base64url.git", + {ref,"f2c64ed8b9bebc536fad37ad97243452b674b837"}}, + 0}, + {<<"bert">>, + {git,"git://github.com/synrc/bert", + {ref,"9bf347a128c0af6ca422dffb8f066ec1ff9fafca"}}, + 0}, + {<<"bpe">>, + {git,"git://github.com/spawnproc/bpe.git", + {ref,"73fa6ab18d77e8689c18a80e6dd1add2fdd4db22"}}, + 0}, + {<<"certifi">>,{pkg,<<"certifi">>,<<"2.4.2">>},1}, + {<<"counters">>, + {git,"https://github.com/deadtrickster/counters.erl.git", + {ref,"c3f4aa3acdf71c3db0a4b3fc1343aa45de2c5df0"}}, + 0}, + {<<"cowboy">>, + {git,"git://github.com/voxoz/cowboy", + {ref,"c1cfbfa5dc6b5f6ecd9591ad5bf642b6a107a7f5"}}, + 0}, + {<<"cowlib">>, + {git,"git://github.com/voxoz/cowlib", + {ref,"5cc0038d0a3ae6a829646ddfff998d8c491969ca"}}, + 1}, + {<<"ctx">>, + {git,"https://github.com/tsloughter/ctx.git", + {ref,"a5a6b0948708e02bc7b9cb6248807c9ff8327940"}}, + 0}, + {<<"emq_dashboard">>, + {git,"git://github.com/ne-luboff/emq_dashboard", + {ref,"f711e8d2b0a992f5540123f3504eebabc324a684"}}, + 0}, + {<<"emqttc">>, + {git,"git://github.com/voxoz/emqttc", + {ref,"141fd2e925be854321d22005313762adb1195f48"}}, + 0}, + {<<"emqttd">>, + {git,"git://github.com/synrc/emqttd", + {ref,"c3d0b7b092fffe7bebe27af27dbbfe1714757d1c"}}, + 0}, + {<<"envy">>, + {git,"https://github.com/markan/envy.git", + {ref,"0148fb4b7ed0e188511578e98b42d6e7dde0ebd1"}}, + 1}, + {<<"erlang-uuid">>, + {git,"https://github.com/avtobiff/erlang-uuid.git", + {ref,"cb02a2039a9b29dd2eef0446039c9c6e164df9ef"}}, + 0}, + {<<"erlydtl">>, + {git,"git://github.com/voxoz/erlydtl", + {ref,"bdebe6f87d8f989018facbbf8dc6320936ffe98f"}}, + 0}, + {<<"esockd">>, + {git,"https://github.com/voxoz/esockd", + {ref,"a80634b961c315ffe5f020d73236473b53ae5dc9"}}, + 0}, + {<<"fs">>, + {git,"git://github.com/synrc/fs", + {ref,"dfa36b8fd363cdebff4755c42ce0565d05caaccf"}}, + 1}, + {<<"gen_logger">>, + {git,"git://github.com/voxoz/gen_logger", + {ref,"5b14530363feb0b049c4f5c7c606f815aec781d2"}}, + 1}, + {<<"gen_smtp">>, + {git,"git://github.com/ne-luboff/gen_smtp", + {ref,"89eb26f8a81b0dce76aedae5695a923c8ac98695"}}, + 0}, + {<<"goldrush">>, + {git,"git://github.com/voxoz/goldrush.git", + {ref,"9e92405985827fabd2508b92bdc8b28b9e17b668"}}, + 2}, + {<<"gproc">>, + {git,"https://github.com/uwiger/gproc", + {ref,"1d16f5e6d7cf616eec4395f2385e3a680a4ffc9f"}}, + 0}, + {<<"ibrowse">>, + {git,"git://github.com/cmullaparthi/ibrowse.git", + {ref,"c97136cfb61fcc6f39d4e7da47372a64f7fca04e"}}, + 1}, + {<<"jsx">>, + {git,"https://github.com/talentdeficit/jsx.git", + {ref,"fc2a001073f2300ba38427c23e83d5673c020542"}}, + 0}, + {<<"jwt">>, + {git,"https://github.com/artemeff/jwt.git", + {ref,"cf0fc2688148a5b4e1583e0a2788c0aa5b522df7"}}, + 0}, + {<<"kvs">>, + {git,"git://github.com/synrc/kvs", + {ref,"6a4ae5cec94add55c95ce4eb497732d682e6cfcc"}}, + 1}, + {<<"lager">>, + {git,"git://github.com/voxoz/lager", + {ref,"1ecf4c17e9e39dd7a1943140477f632d17518f0c"}}, + 1}, + {<<"libphonenumber_erlang">>, + {git,"https://github.com/marinakr/libphonenumber_erlang.git", + {ref,"463826dd0a2e6c94052fb11ea989a82d4eb67aeb"}}, + 0}, + {<<"locus">>, + {git,"https://github.com/g-andrade/locus.git", + {ref,"6353e964a2523fd0e3e5fb10abf0516bfe96c943"}}, + 0}, + {<<"mad">>, + {git,"git://github.com/synrc/mad", + {ref,"ff187398f0d1a3c9081bce6e614319aa322f5be8"}}, + 1}, + {<<"migresia">>, + {git,"https://github.com/yoonka/migresia.git", + {ref,"40e11825e01502d045e87bf8b5d7dc5a9d6e3f73"}}, + 0}, + {<<"mini_s3">>, + {git,"https://github.com/chef/mini_s3.git", + {ref,"df0c68ea901343b8e0c647142d88d7f3aae27e7b"}}, + 0}, + {<<"mochiweb">>, + {git,"git://github.com/voxoz/mochiweb", + {ref,"c53540557dba6d79c347209fc9980e97dcf3dd3f"}}, + 1}, + {<<"n2o">>, + {git,"git://github.com/synrc/n2o", + {ref,"7a4f929a27c83c33f3844ca5f6491ff17a1956ce"}}, + 0}, + {<<"nitro">>, + {git,"git://github.com/synrc/nitro", + {ref,"3f15180c00fcc5c49686d2afe6267467d844e06a"}}, + 1}, + {<<"opencensus-erlang">>, + {git,"https://github.com/voxoz/opencensus-erlang", + {ref,"8dc9ae86f5c1ef69593fe37b49e649afed6bd201"}}, + 0}, + {<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.3.0">>},2}, + {<<"prometheus">>, + {git,"https://github.com/deadtrickster/prometheus.erl", + {ref,"2a0e4f2a1b35efa48f79db8f4c1ceb36297bd79b"}}, + 0}, + {<<"ranch">>, + {git,"git://github.com/voxoz/ranch", + {ref,"1a75038c82ede22efec46a7dca192b8ce26309e0"}}, + 1}, + {<<"rest">>, + {git,"git://github.com/synrc/rest", + {ref,"55f5a58abd63b39667958e5981e6d1b293f77e2e"}}, + 0}, + {<<"review">>, + {git,"git://github.com/synrc/review", + {ref,"e147bec52b9190c94f046fdc4d6c992d6984690d"}}, + 0}, + {<<"rfc3339">>, + {git,"https://github.com/talentdeficit/rfc3339", + {ref,"90effc078c5e673d025b2c1269a153ad4748d3df"}}, + 0}, + {<<"sh">>, + {git,"git://github.com/synrc/sh", + {ref,"2cb1bbfeef7f1a1e36c77d08f0941ea2a5549d61"}}, + 2}, + {<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.4">>},1}, + {<<"stacktrace_compat">>,{pkg,<<"stacktrace_compat">>,<<"1.0.2">>},1}, + {<<"syn">>, + {git,"git://github.com/ostinelli/syn", + {ref,"9964eb8969b6e1e712249d3aed4f3dfafd3aaac3"}}, + 1}, + {<<"wts">>, + {git,"https://github.com/tsloughter/wts.git", + {ref,"5613b6c4354867fd2b02fde5ef15bf80190b8586"}}, + 0}]}. +[ +{pkg_hash,[ + {<<"certifi">>, <<"75424FF0F3BAACCFD34B1214184B6EF616D89E420B258BB0A5EA7D7BC628F7F0">>}, + {<<"parse_trans">>, <<"09765507A3C7590A784615CFD421D101AEC25098D50B89D7AA1D66646BC571C1">>}, + {<<"ssl_verify_fun">>, <<"F0EAFFF810D2041E93F915EF59899C923F4568F4585904D010387ED74988E77B">>}, + {<<"stacktrace_compat">>, <<"8AD31C32C9A0EADB1EB298F04DC8B0C8D79BCC6233A638B02791FFCA4F331275">>}]} +]. -- GitLab From 20f7ec0521414d46c8b6a14d5cc5a28e46955d79 Mon Sep 17 00:00:00 2001 From: Metin Akat Date: Sun, 17 Mar 2019 15:06:58 +0200 Subject: [PATCH 2/4] upgrade libraries for mad compatibility --- rebar.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rebar.lock b/rebar.lock index 7f34da057..afa56d1b5 100644 --- a/rebar.lock +++ b/rebar.lock @@ -102,11 +102,11 @@ 1}, {<<"libphonenumber_erlang">>, {git,"https://github.com/marinakr/libphonenumber_erlang.git", - {ref,"463826dd0a2e6c94052fb11ea989a82d4eb67aeb"}}, + {ref,"5b712b7c5e66cdef0bb89482e8220bb23bc2b5a9"}}, 0}, {<<"locus">>, {git,"https://github.com/g-andrade/locus.git", - {ref,"6353e964a2523fd0e3e5fb10abf0516bfe96c943"}}, + {ref,"0ea9079ce5686573e0e70e2b1311343dd25feef8"}}, 0}, {<<"mad">>, {git,"git://github.com/synrc/mad", -- GitLab From 3b72785d54fa379f6f5386b041cfc7606ad8cb8e Mon Sep 17 00:00:00 2001 From: Metin Akat Date: Tue, 19 Mar 2019 14:17:32 +0200 Subject: [PATCH 3/4] fix merge conflicts with latest cluster --- apps/roster/src/rest/rest_chat_csv.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/roster/src/rest/rest_chat_csv.erl b/apps/roster/src/rest/rest_chat_csv.erl index 60ba4d2e3..6cd0f109c 100644 --- a/apps/roster/src/rest/rest_chat_csv.erl +++ b/apps/roster/src/rest/rest_chat_csv.erl @@ -9,7 +9,7 @@ %%%----------------------------------------------------------------------------- -module(rest_chat_csv). -include("roster.hrl"). --include_lib("roster/static/rest_var.hrl"). +-include_lib("roster/include/static/rest_var.hrl"). -include_lib("kvs/include/metainfo.hrl"). -export([ -- GitLab From 03cd49d5df69149171852275e01e727f89d0d56d Mon Sep 17 00:00:00 2001 From: Metin Akat Date: Wed, 20 Mar 2019 08:39:44 +0200 Subject: [PATCH 4/4] ensure working libphonenumber_erlang --- rebar.config | 4 ++-- rebar.lock | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rebar.config b/rebar.config index fb8d85b37..3f6b5cbbe 100644 --- a/rebar.config +++ b/rebar.config @@ -2,7 +2,7 @@ {lib_dirs,["apps","deps"]}. {deps_dir,"deps"}. {deps, [ -%% {lager, ".*", {git, "https://github.com/erlang-lager/lager.git", {tag, "3.6.1"}}}, + {lager, ".*", {git,"git://github.com/voxoz/lager", {ref,"1ecf4c17e9e39dd7a1943140477f632d17518f0c"}}}, {bert, ".*", {git, "git://github.com/synrc/bert",{tag,"master"}}}, {active, ".*", {git, "git://github.com/synrc/active",{tag,"master"}}}, {esockd, ".*", {git, "https://github.com/voxoz/esockd",{ref, "a80634b961c315ffe5f020d73236473b53ae5dc9"}}}, @@ -15,7 +15,7 @@ {gen_smtp, ".*", {git, "git://github.com/ne-luboff/gen_smtp",{tag,"master"}}}, {emq_dashboard, ".*", {git, "git://github.com/ne-luboff/emq_dashboard",{tag,"master"}}}, {'opencensus-erlang', ".*", {git, "https://github.com/voxoz/opencensus-erlang",{tag, "v0.4.0"}}}, - {libphonenumber_erlang, ".*", {git, "https://github.com/marinakr/libphonenumber_erlang.git",{tag,"master"}}}, + {libphonenumber_erlang, ".*", {git, "https://github.com/loxs/libphonenumber_erlang.git",{tag,"master"}}}, {gproc, ".*", {git, "https://github.com/uwiger/gproc","0.6.1"}}, {erlydtl, ".*", {git, "git://github.com/voxoz/erlydtl",{tag,"master"}}}, diff --git a/rebar.lock b/rebar.lock index afa56d1b5..7e3256db8 100644 --- a/rebar.lock +++ b/rebar.lock @@ -101,8 +101,8 @@ {ref,"1ecf4c17e9e39dd7a1943140477f632d17518f0c"}}, 1}, {<<"libphonenumber_erlang">>, - {git,"https://github.com/marinakr/libphonenumber_erlang.git", - {ref,"5b712b7c5e66cdef0bb89482e8220bb23bc2b5a9"}}, + {git,"https://github.com/loxs/libphonenumber_erlang.git", + {ref,"da6656a9fb43f91c4bfc3e05066f1d834dabb335"}}, 0}, {<<"locus">>, {git,"https://github.com/g-andrade/locus.git", -- GitLab