diff --git a/.gitignore b/.gitignore index 3470d5b8bce787ccc47c3ed9f80a63c96548e62c..2bb7aeef6524950cee9d731005c2ec10530e0f2f 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 49f7b7231fd1dbd565ed8099b798884e1df5930e..fb4a5f9d50f8f8ba2d06c4c9a605ea51056c81e7 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 71e9d8b0934327de91fe8bce127797e3bb078d57..ef79bee0925f35325438b7be079bb94a910e3d5b 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 4fa3e7a8ed672a92c3cf498e05c9aa3107882af9..9b2f984adedb33b0829bd1476cac44f4c1260675 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 ec7f7d7e7032cad44675a3515b01cdc789fb053c..f0d531f66647fdf7fc176060a7d38752a07ba91f 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 3bdc6e3b3c296ecf58d4788924b550d619c00114..d5de8c7af3107c0ec25b0922c48bb8f031dc9850 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 1be559dbfe659f14a3f11a4f9f6a97549e47e42e..a5b42738746d298da739a10122d9eca8b1b3f185 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 2e850e2cfc1102fb0799a426b10b25bcece6f7da..92b2b9644e86cb47f1d025c5ce9df151e650ad5e 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 1d348dedb1cb3015708d267682209e30abbfb985..8650a2bcf8c9de55b4e0e6476d71e39293e34fe9 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 e32320da5101bded83b8583d1bf6abeb76661d32..a73ebabfff48c5d638f84fffbff031af5c8e90b9 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 432b3f61ce6b8de6989b0a70856ff3b3d962aacd..ee20e2b6ff0559dd0535c121ca83837fdf525be0 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 0e78e6be26af6773f9db5f646e3530f5ef2f094b..6df46ca442acfb29bf77175cf03925aba1617d9a 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 ad40adc8a01dfe0f804afcac166acb483631c27e..6b27fe9b92bb044f5b0615b65a9b87a4040cc55f 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 b37e074d20cc53e08ac80c713c370836f34b17c4..3fc70cc5e99b4e7131c8a1f27857957db8f27e19 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_chat_csv.erl b/apps/roster/src/rest/rest_chat_csv.erl index 60ba4d2e3884409d91592bb8bb7017bb197db465..6cd0f109c9ec8aea652d8cc53e3cedec12b8b8e3 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([ diff --git a/apps/roster/src/rest/rest_cri.erl b/apps/roster/src/rest/rest_cri.erl index 2c7c427dc08db33e2a5da7354578f1b10e915a7b..932e5826e50c4d32e09597b0f5464fe536d4540f 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 e2181b1a9d9bb1b18fb0b7b79d7aa751d90110f3..9037234e5391eefb1aa109f7fc1d9fc2f5621ca0 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 91ca37107b62f92295f2e5dcd5e43d3441060e1d..fa030dfa1274c244048c5b290c13ffd32bd696c8 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 987856a31d4e8a686bcf6ba20a853b716c0dca3c..6a4375066a284438047c218b11398281011dc172 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 07c2aefc037f8ca316bc24f296fcc5705ae696da..efd80c2948ba9a63cf7aa08e5dbebf756ec22ba1 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 b0efddb1df0d930461891be8423030314c9cba1d..e4c1464705c1cb495c363af7a14193f982c368e9 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 79d0042396b18a54db462b14a365fbc25daa4c36..21fb0cf1c5c924b0a42f3f859d9b41b632fb717e 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 5c1aa540f13be34531806677596ccf3f7fa43ec6..2563aafbfba1f6233f6739cddefb96d266352b5a 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 6164df2c75cf042f24593bca81167282b30d8b26..ff01a429bd89f0d1f68c6664dac596415f9ee0bf 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 4e94579b512e297e63b06e97bdcbf562c278aca4..40a6699aff208c95c9e6203888ff6e4296c0cb69 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 82d98c5eaec1f521a2e349bd8a64f0582bd834c7..c562b8d4323f5e6738dc5a64a1f999f537cf2e08 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 7c8a358b484d0c1e2ed4651b3074daed2dbd4bdf..0f7aa4717067703ebfe5c5c187afed265df2897c 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 ccc5e611718f49e6dbb01fcebc91e374364be374..3f6b5cbbebd6e2d52e61c8f26f5f20bd882bce14 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,"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",{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/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 new file mode 100644 index 0000000000000000000000000000000000000000..7e3256db834ca8f417cd3fad5c391a0b4c7b582e --- /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/loxs/libphonenumber_erlang.git", + {ref,"da6656a9fb43f91c4bfc3e05066f1d834dabb335"}}, + 0}, + {<<"locus">>, + {git,"https://github.com/g-andrade/locus.git", + {ref,"0ea9079ce5686573e0e70e2b1311343dd25feef8"}}, + 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">>}]} +].