Sort dependencies and improve some indentation

1 files changed, 70 insertions, 67 deletions

diff --git a/rebar.config b/rebar.config
index ee2fc7ae..02241794 100644
--- a/rebar.config
+++ b/rebar.config
@@ -18,68 +18,71 @@
 %%%
 %%%----------------------------------------------------------------------
 
-{deps, [{lager, ".*", {git, "https://github.com/erlang-lager/lager", "3.6.10"}},
-	{p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.19"}}},
+{deps, [{base64url, ".*", {git, "https://github.com/dvv/base64url.git", {tag, "v1.0"}}},
         {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.24"}}},
+        {eimp, ".*", {git, "https://github.com/processone/eimp", {tag, "1.0.16"}}},
+        {if_var_true, elixir, %% Elixir support, needed to run tests
+         {elixir, ".*", {git, "https://github.com/elixir-lang/elixir",
+                         {tag, {if_version_above, "17", "v1.4.4", "v1.1.1"}}}}},
+        {if_var_true, pam,
+         {epam, ".*", {git, "https://github.com/processone/epam", {tag, "1.0.8"}}}},
+        {if_var_true, redis,
+         {eredis, ".*", {git, "https://github.com/wooga/eredis", {tag, "v1.0.8"}}}},
+        {if_var_true, sip,
+         {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.35"}}}},
+        {if_var_true, zlib,
+         {ezlib, ".*", {git, "https://github.com/processone/ezlib", {tag, "1.0.8"}}}},
         {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.1.7"}}},
-        {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.21"}}},
         {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.42"}}},
-	{idna, ".*", {git, "https://github.com/benoitc/erlang-idna", {tag, "6.0.0"}}},
-        {xmpp, ".*", {git, "https://github.com/processone/xmpp", {tag, "1.4.8"}}},
         {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.26"}}},
-	{yconf, ".*", {git, "https://github.com/processone/yconf", {tag, "1.0.6"}}},
+        {idna, ".*", {git, "https://github.com/benoitc/erlang-idna", {tag, "6.0.0"}}},
         {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "1.0.5"}}},
-        {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.6"}}},
-        {pkix, ".*", {git, "https://github.com/processone/pkix", {tag, "1.0.5"}}},
         {jose, ".*", {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.9.0"}}},
-        {eimp, ".*", {git, "https://github.com/processone/eimp", {tag, "1.0.16"}}},
+        {lager, ".*", {git, "https://github.com/erlang-lager/lager", "3.6.10"}},
+        {if_var_true, tools,
+         {luerl, ".*", {git, "https://github.com/rvirding/luerl", {tag, "v0.3"}}}},
         {mqtree, ".*", {git, "https://github.com/processone/mqtree", {tag, "1.0.9"}}},
-	{p1_acme, ".*", {git, "https://github.com/processone/p1_acme.git", {tag, "1.0.7"}}},
-        {base64url, ".*", {git, "https://github.com/dvv/base64url.git", {tag, "v1.0"}}},
-        {if_var_true, stun, {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.35"}}}},
-        {if_var_true, sip, {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.35"}}}},
-        {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql",
-                                               {tag, "1.0.15"}}}},
-        {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql",
-                                               {tag, "1.1.9"}}}},
-        {if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/processone/erlang-sqlite3",
-                                               {tag, "1.1.8"}}}},
-        {if_var_true, pam, {epam, ".*", {git, "https://github.com/processone/epam",
-                                           {tag, "1.0.8"}}}},
-        {if_var_true, zlib, {ezlib, ".*", {git, "https://github.com/processone/ezlib",
-                                           {tag, "1.0.8"}}}},
-        %% 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"}}}}},
-        %% 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"}}}},
-        {if_var_true, tools, {luerl, ".*", {git, "https://github.com/rvirding/luerl",
-                                            {tag, "v0.3"}}}},
-        {if_var_true, redis, {eredis, ".*", {git, "https://github.com/wooga/eredis",
-                                             {tag, "v1.0.8"}}}}]}.
+        {p1_acme, ".*", {git, "https://github.com/processone/p1_acme.git", {tag, "1.0.7"}}},
+        {if_var_true, mysql,
+         {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql", {tag, "1.0.15"}}}},
+        {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.6"}}},
+        {if_var_true, pgsql,
+         {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql", {tag, "1.1.9"}}}},
+        {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.19"}}},
+        {pkix, ".*", {git, "https://github.com/processone/pkix", {tag, "1.0.5"}}},
+        {if_not_rebar3, %% Needed because modules are not fully migrated to new structure and mix
+         {if_var_true, elixir,
+          {rebar_elixir_plugin, ".*", {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}}},
+        {if_var_true, sqlite,
+         {sqlite3, ".*", {git, "https://github.com/processone/erlang-sqlite3", {tag, "1.1.8"}}}},
+        {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.21"}}},
+        {if_var_true, stun,
+         {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.35"}}}},
+        {xmpp, ".*", {git, "https://github.com/processone/xmpp", {tag, "1.4.8"}}},
+        {yconf, ".*", {git, "https://github.com/processone/yconf", {tag, "1.0.6"}}}
+       ]}.
 
 {if_var_true, latest_deps,
  {floating_deps, [cache_tab,
+                  eimp,
+                  epam,
+                  esip,
+                  ezlib,
                   fast_tls,
-                  stringprep,
                   fast_xml,
-                  esip,
-                  stun,
                   fast_yaml,
-                  xmpp,
-                  p1_utils,
+                  mqtree,
+                  p1_acme,
                   p1_mysql,
-                  p1_pgsql,
                   p1_oauth2,
-                  epam,
-                  ezlib,
-                  eimp,
-                  mqtree,
+                  p1_pgsql,
+                  p1_utils,
                   pkix,
-                  yconf,
                   sqlite3,
-                  p1_acme]}}.
+                  stringprep,
+                  stun,
+                  xmpp,
+                  yconf]}}.
 
 {erl_first_files, ["src/ejabberd_sql_pt.erl", "src/ejabberd_config.erl",
 		   "src/gen_mod.erl", "src/mod_muc_room.erl",
@@ -88,23 +91,23 @@
 {erl_opts, [nowarn_deprecated_function,
             {i, "include"},
             {i, "deps/fast_xml/include"},
-            {i, "deps/xmpp/include"},
             {i, "deps/p1_utils/include"},
-            {if_var_false, debug, no_debug_info},
-            {if_var_true, debug, debug_info},
-            {if_var_true, sip, {d, 'SIP'}},
-            {if_var_true, stun, {d, 'STUN'}},
+            {i, "deps/xmpp/include"},
             {if_version_above, "20", {d, 'DEPRECATED_GET_STACKTRACE'}},
             {if_version_below, "21", {d, 'USE_OLD_HTTP_URI'}},
-	    {if_version_below, "22", {d, 'LAGER'}},
+            {if_version_below, "22", {d, 'LAGER'}},
             {if_version_below, "23", {d, 'USE_OLD_CRYPTO_HMAC'}},
             {if_version_below, "23", {d, 'USE_OLD_PG2'}},
-            {if_var_true, roster_gateway_workaround, {d, 'ROSTER_GATWAY_WORKAROUND'}},
             {if_var_match, db_type, mssql, {d, 'mssql'}},
+            {if_var_false, debug, no_debug_info},
+            {if_var_true, debug, debug_info},
             {if_var_true, elixir, {d, 'ELIXIR_ENABLED'}},
-            {if_var_true, new_sql_schema, {d, 'NEW_SQL_SCHEMA'}},
             {if_var_true, hipe, native},
-	    {if_have_fun, {erl_error, format_exception, 6}, {d, 'HAVE_ERL_ERROR'}},
+            {if_var_true, new_sql_schema, {d, 'NEW_SQL_SCHEMA'}},
+            {if_var_true, roster_gateway_workaround, {d, 'ROSTER_GATWAY_WORKAROUND'}},
+            {if_var_true, sip, {d, 'SIP'}},
+            {if_var_true, stun, {d, 'STUN'}},
+            {if_have_fun, {erl_error, format_exception, 6}, {d, 'HAVE_ERL_ERROR'}},
             {src_dirs, [src,
                         {if_var_true, tools, tools},
                         {if_var_true, elixir, include}]}]}.
@@ -134,20 +137,20 @@
 {xref_exclusions, [
                    "(\"gen_transport\":_/_)",
                    "(\"eprof\":_/_)",
-                   {if_var_false, mysql, "(\".*mysql.*\":_/_)"},
-                   {if_var_false, pgsql, "(\".*pgsql.*\":_/_)"},
-                   {if_var_false, pam, "(\"epam\":_/_)"},
-                   {if_var_false, zlib, "(\"ezlib\":_/_)"},
+                   {if_var_false, elixir, "(\"Elixir.*\":_/_)"},
                    {if_var_false, http, "(\"lhttpc\":_/_)"},
+                   {if_var_false, mysql, "(\".*mysql.*\":_/_)"},
                    {if_var_false, odbc, "(\"odbc\":_/_)"},
+                   {if_var_false, pam, "(\"epam\":_/_)"},
+                   {if_var_false, pgsql, "(\".*pgsql.*\":_/_)"},
+                   {if_var_false, redis, "(\"eredis\":_/_)"},
                    {if_var_false, sqlite, "(\"sqlite3\":_/_)"},
-                   {if_var_false, elixir, "(\"Elixir.*\":_/_)"},
-                   {if_var_false, redis, "(\"eredis\":_/_)"}]}.
+                   {if_var_false, zlib, "(\"ezlib\":_/_)"}]}.
 
 {eunit_compile_opts, [{i, "tools"},
                       {i, "include"},
-                      {i, "deps/p1_utils/include"},
                       {i, "deps/fast_xml/include"},
+                      {i, "deps/p1_utils/include"},
                       {i, "deps/xmpp/include"}]}.
 
 {cover_enabled, true}.
@@ -157,14 +160,14 @@
 {overrides, [
   {del, [{erl_opts, [warnings_as_errors]}]}]}.
 
-{post_hook_configure, [{"fast_tls", []},
-                       {"stringprep", []},
-                       {"fast_yaml", []},
-                       {"eimp", []},
+{post_hook_configure, [{"eimp", []},
+                       {if_var_true, pam, {"epam", []}},
                        {if_var_true, sip, {"esip", []}},
+                       {if_var_true, zlib, {"ezlib", []}},
+                       {"fast_tls", []},
                        {"fast_xml", [{if_var_true, full_xml, "--enable-full-xml"}]},
-                       {if_var_true, pam, {"epam", []}},
-                       {if_var_true, zlib, {"ezlib", []}}]}.
+                       {"fast_yaml", []},
+                       {"stringprep", []}]}.
 
 %% Local Variables:
 %% mode: erlang