From ba002bb1b535f265a088bac689f9767b939d66d3 Mon Sep 17 00:00:00 2001 From: x1001100011 Date: Sun, 27 Jun 2021 23:25:51 -0700 Subject: [PATCH 1/2] fix: remove mix files for emqx_lua_hook --- apps/emqx_lua_hook/.formatter.exs | 4 ---- apps/emqx_lua_hook/mix.exs | 33 ------------------------------- 2 files changed, 37 deletions(-) delete mode 100644 apps/emqx_lua_hook/.formatter.exs delete mode 100644 apps/emqx_lua_hook/mix.exs diff --git a/apps/emqx_lua_hook/.formatter.exs b/apps/emqx_lua_hook/.formatter.exs deleted file mode 100644 index d2cda26ed..000000000 --- a/apps/emqx_lua_hook/.formatter.exs +++ /dev/null @@ -1,4 +0,0 @@ -# Used by "mix format" -[ - inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"] -] diff --git a/apps/emqx_lua_hook/mix.exs b/apps/emqx_lua_hook/mix.exs deleted file mode 100644 index 933d4e352..000000000 --- a/apps/emqx_lua_hook/mix.exs +++ /dev/null @@ -1,33 +0,0 @@ -defmodule EmqxLuaHook.MixProject do - use Mix.Project - - def project do - [ - app: :emqx_lua_hook, - version: "4.3.0", - build_path: "../../_build", - config_path: "../../config/config.exs", - deps_path: "../../deps", - lockfile: "../../mix.lock", - elixir: "~> 1.12", - start_permanent: Mix.env() == :prod, - deps: deps(), - description: "EMQ X Lua Hooks" - ] - end - - def application do - [ - mod: {:emqx_lua_hook_app, []}, - extra_applications: [:logger] - ] - end - - defp deps do - [ - {:emqx, in_umbrella: true}, - # {:luerl, github: "emqx/luerl", manager: :rebar3, tag: "v0.3.1"} - {:luerl, github: "rvirding/luerl", manager: :rebar3} - ] - end -end From e40148a6ddb0c25125ddc3cb6c96491b7417132e Mon Sep 17 00:00:00 2001 From: x1001100011 Date: Sun, 27 Jun 2021 23:35:52 -0700 Subject: [PATCH 2/2] feat: Emqx -> EMQX --- .formatter.exs | 5 +++++ apps/emqx/mix.exs | 2 +- apps/emqx_authentication/mix.exs | 2 +- apps/emqx_authz/mix.exs | 2 +- apps/emqx_bridge_mqtt/mix.exs | 2 +- apps/emqx_coap/mix.exs | 2 +- apps/emqx_connector/mix.exs | 2 +- apps/emqx_dashboard/mix.exs | 2 +- apps/emqx_data_bridge/mix.exs | 2 +- apps/emqx_exhook/mix.exs | 2 +- apps/emqx_exproto/mix.exs | 2 +- apps/emqx_lwm2m/mix.exs | 2 +- apps/emqx_management/mix.exs | 2 +- apps/emqx_modules/mix.exs | 2 +- apps/emqx_plugin_libs/mix.exs | 2 +- apps/emqx_prometheus/mix.exs | 2 +- apps/emqx_psk_file/mix.exs | 2 +- apps/emqx_resource/mix.exs | 2 +- apps/emqx_retainer/mix.exs | 2 +- apps/emqx_rule_engine/mix.exs | 2 +- apps/emqx_sasl/.formatter.exs | 4 ---- apps/emqx_sasl/mix.exs | 33 -------------------------------- apps/emqx_sn/mix.exs | 2 +- apps/emqx_statsd/mix.exs | 2 +- apps/emqx_stomp/mix.exs | 6 ++++-- apps/emqx_telemetry/mix.exs | 2 +- apps/emqx_web_hook/mix.exs | 2 +- mix.exs | 2 +- 28 files changed, 33 insertions(+), 63 deletions(-) create mode 100644 .formatter.exs delete mode 100644 apps/emqx_sasl/.formatter.exs delete mode 100644 apps/emqx_sasl/mix.exs diff --git a/.formatter.exs b/.formatter.exs new file mode 100644 index 000000000..90a08535c --- /dev/null +++ b/.formatter.exs @@ -0,0 +1,5 @@ +# Used by "mix format" +[ + inputs: ["mix.exs", "config/*.exs"], + subdirectories: ["apps/*"] +] diff --git a/apps/emqx/mix.exs b/apps/emqx/mix.exs index e6bf1f1c4..26ffb0624 100644 --- a/apps/emqx/mix.exs +++ b/apps/emqx/mix.exs @@ -1,4 +1,4 @@ -defmodule Emqx.MixProject do +defmodule EMQX.MixProject do use Mix.Project def project do diff --git a/apps/emqx_authentication/mix.exs b/apps/emqx_authentication/mix.exs index a8df08d99..04a872a53 100644 --- a/apps/emqx_authentication/mix.exs +++ b/apps/emqx_authentication/mix.exs @@ -1,4 +1,4 @@ -defmodule EmqxAuthentication.MixProject do +defmodule EMQXAuthentication.MixProject do use Mix.Project def project do diff --git a/apps/emqx_authz/mix.exs b/apps/emqx_authz/mix.exs index 80c1520a2..2674afdf5 100644 --- a/apps/emqx_authz/mix.exs +++ b/apps/emqx_authz/mix.exs @@ -1,4 +1,4 @@ -defmodule EmqxAuthz.MixProject do +defmodule EMQXAuthz.MixProject do use Mix.Project def project do diff --git a/apps/emqx_bridge_mqtt/mix.exs b/apps/emqx_bridge_mqtt/mix.exs index 177e7f618..70b4c553c 100644 --- a/apps/emqx_bridge_mqtt/mix.exs +++ b/apps/emqx_bridge_mqtt/mix.exs @@ -1,4 +1,4 @@ -defmodule EmqxBridgeMqtt.MixProject do +defmodule EMQXBridgeMqtt.MixProject do use Mix.Project def project do diff --git a/apps/emqx_coap/mix.exs b/apps/emqx_coap/mix.exs index d82810601..986914b30 100644 --- a/apps/emqx_coap/mix.exs +++ b/apps/emqx_coap/mix.exs @@ -1,4 +1,4 @@ -defmodule EmqxCoap.MixProject do +defmodule EMQXCoap.MixProject do use Mix.Project def project do diff --git a/apps/emqx_connector/mix.exs b/apps/emqx_connector/mix.exs index cc77b6bc8..b0903d6a2 100644 --- a/apps/emqx_connector/mix.exs +++ b/apps/emqx_connector/mix.exs @@ -1,4 +1,4 @@ -defmodule EmqxConnector.MixProject do +defmodule EMQXConnector.MixProject do use Mix.Project def project do diff --git a/apps/emqx_dashboard/mix.exs b/apps/emqx_dashboard/mix.exs index e6fea46b4..6da67234c 100644 --- a/apps/emqx_dashboard/mix.exs +++ b/apps/emqx_dashboard/mix.exs @@ -1,4 +1,4 @@ -defmodule EmqxDashboard.MixProject do +defmodule EMQXDashboard.MixProject do use Mix.Project def project do diff --git a/apps/emqx_data_bridge/mix.exs b/apps/emqx_data_bridge/mix.exs index 9cec3e66b..d4048578f 100644 --- a/apps/emqx_data_bridge/mix.exs +++ b/apps/emqx_data_bridge/mix.exs @@ -1,4 +1,4 @@ -defmodule EmqxDataBridge.MixProject do +defmodule EMQXDataBridge.MixProject do use Mix.Project def project do diff --git a/apps/emqx_exhook/mix.exs b/apps/emqx_exhook/mix.exs index bfef64a31..03f03fce6 100644 --- a/apps/emqx_exhook/mix.exs +++ b/apps/emqx_exhook/mix.exs @@ -1,4 +1,4 @@ -defmodule EmqxExhook.MixProject do +defmodule EMQXExhook.MixProject do use Mix.Project def project do diff --git a/apps/emqx_exproto/mix.exs b/apps/emqx_exproto/mix.exs index 894e349cb..610e989ab 100644 --- a/apps/emqx_exproto/mix.exs +++ b/apps/emqx_exproto/mix.exs @@ -1,4 +1,4 @@ -defmodule EmqxExproto.MixProject do +defmodule EMQXExproto.MixProject do use Mix.Project def project do diff --git a/apps/emqx_lwm2m/mix.exs b/apps/emqx_lwm2m/mix.exs index 0f2664c89..6a270221f 100644 --- a/apps/emqx_lwm2m/mix.exs +++ b/apps/emqx_lwm2m/mix.exs @@ -1,4 +1,4 @@ -defmodule EmqxLwm2m.MixProject do +defmodule EMQXLwm2m.MixProject do use Mix.Project def project do diff --git a/apps/emqx_management/mix.exs b/apps/emqx_management/mix.exs index 54c4d86dd..77bfed0a9 100644 --- a/apps/emqx_management/mix.exs +++ b/apps/emqx_management/mix.exs @@ -1,4 +1,4 @@ -defmodule EmqxManagement.MixProject do +defmodule EMQXManagement.MixProject do use Mix.Project def project do diff --git a/apps/emqx_modules/mix.exs b/apps/emqx_modules/mix.exs index 6268f7933..27fb16923 100644 --- a/apps/emqx_modules/mix.exs +++ b/apps/emqx_modules/mix.exs @@ -1,4 +1,4 @@ -defmodule EmqxModules.MixProject do +defmodule EMQXModules.MixProject do use Mix.Project def project do diff --git a/apps/emqx_plugin_libs/mix.exs b/apps/emqx_plugin_libs/mix.exs index af5d1a0f9..8674813a4 100644 --- a/apps/emqx_plugin_libs/mix.exs +++ b/apps/emqx_plugin_libs/mix.exs @@ -1,4 +1,4 @@ -defmodule EmqxPluginLibs.MixProject do +defmodule EMQXPluginLibs.MixProject do use Mix.Project def project do diff --git a/apps/emqx_prometheus/mix.exs b/apps/emqx_prometheus/mix.exs index c53b6d072..607b535e8 100644 --- a/apps/emqx_prometheus/mix.exs +++ b/apps/emqx_prometheus/mix.exs @@ -1,4 +1,4 @@ -defmodule EmqxPrometheus.MixProject do +defmodule EMQXPrometheus.MixProject do use Mix.Project def project do diff --git a/apps/emqx_psk_file/mix.exs b/apps/emqx_psk_file/mix.exs index 95d213c0f..ad89257ff 100644 --- a/apps/emqx_psk_file/mix.exs +++ b/apps/emqx_psk_file/mix.exs @@ -1,4 +1,4 @@ -defmodule EmqxPskFile.MixProject do +defmodule EMQXPskFile.MixProject do use Mix.Project def project do diff --git a/apps/emqx_resource/mix.exs b/apps/emqx_resource/mix.exs index d2a1034d4..3c6197c27 100644 --- a/apps/emqx_resource/mix.exs +++ b/apps/emqx_resource/mix.exs @@ -1,4 +1,4 @@ -defmodule EmqxResource.MixProject do +defmodule EMQXResource.MixProject do use Mix.Project def project do diff --git a/apps/emqx_retainer/mix.exs b/apps/emqx_retainer/mix.exs index b76843696..2148f37fe 100644 --- a/apps/emqx_retainer/mix.exs +++ b/apps/emqx_retainer/mix.exs @@ -1,4 +1,4 @@ -defmodule EmqxRetainer.MixProject do +defmodule EMQXRetainer.MixProject do use Mix.Project def project do diff --git a/apps/emqx_rule_engine/mix.exs b/apps/emqx_rule_engine/mix.exs index feae3e68a..1a6eab546 100644 --- a/apps/emqx_rule_engine/mix.exs +++ b/apps/emqx_rule_engine/mix.exs @@ -1,4 +1,4 @@ -defmodule EmqxRuleEngine.MixProject do +defmodule EMQXRuleEngine.MixProject do use Mix.Project def project do diff --git a/apps/emqx_sasl/.formatter.exs b/apps/emqx_sasl/.formatter.exs deleted file mode 100644 index d2cda26ed..000000000 --- a/apps/emqx_sasl/.formatter.exs +++ /dev/null @@ -1,4 +0,0 @@ -# Used by "mix format" -[ - inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"] -] diff --git a/apps/emqx_sasl/mix.exs b/apps/emqx_sasl/mix.exs deleted file mode 100644 index bd03a4fd7..000000000 --- a/apps/emqx_sasl/mix.exs +++ /dev/null @@ -1,33 +0,0 @@ -defmodule EmqxSasl.MixProject do - use Mix.Project - - def project do - [ - app: :emqx_sasl, - version: "0.1.0", - build_path: "../../_build", - config_path: "../../config/config.exs", - deps_path: "../../deps", - lockfile: "../../mix.lock", - elixir: "~> 1.12", - start_permanent: Mix.env() == :prod, - deps: deps(), - description: "EMQ X SASL" - ] - end - - def application do - [ - registered: [:emqx_sasl_sup], - mod: {:emqx_sasl_app, []}, - extra_applications: [:logger] - ] - end - - defp deps do - [ - {:emqx, in_umbrella: true}, - {:pbkdf2, github: "emqx/erlang-pbkdf2", tag: "2.0.4"} - ] - end -end diff --git a/apps/emqx_sn/mix.exs b/apps/emqx_sn/mix.exs index 1aedb9436..f78ca2061 100644 --- a/apps/emqx_sn/mix.exs +++ b/apps/emqx_sn/mix.exs @@ -1,4 +1,4 @@ -defmodule EmqxSn.MixProject do +defmodule EMQXSn.MixProject do use Mix.Project def project do diff --git a/apps/emqx_statsd/mix.exs b/apps/emqx_statsd/mix.exs index c48e292a6..6823daefe 100644 --- a/apps/emqx_statsd/mix.exs +++ b/apps/emqx_statsd/mix.exs @@ -1,4 +1,4 @@ -defmodule EmqxStatsd.MixProject do +defmodule EMQXStatsd.MixProject do use Mix.Project def project do diff --git a/apps/emqx_stomp/mix.exs b/apps/emqx_stomp/mix.exs index 31eebb4a3..2fab73fc4 100644 --- a/apps/emqx_stomp/mix.exs +++ b/apps/emqx_stomp/mix.exs @@ -1,4 +1,4 @@ -defmodule EmqxStomp.MixProject do +defmodule EMQXStomp.MixProject do use Mix.Project def project do @@ -25,6 +25,8 @@ defmodule EmqxStomp.MixProject do end defp deps do - [{:emqx, in_umbrella: true}] + [ + {:emqx, in_umbrella: true} + ] end end diff --git a/apps/emqx_telemetry/mix.exs b/apps/emqx_telemetry/mix.exs index 37ce47b46..4316d4b92 100644 --- a/apps/emqx_telemetry/mix.exs +++ b/apps/emqx_telemetry/mix.exs @@ -1,4 +1,4 @@ -defmodule EmqxTelemetry.MixProject do +defmodule EMQXTelemetry.MixProject do use Mix.Project def project do diff --git a/apps/emqx_web_hook/mix.exs b/apps/emqx_web_hook/mix.exs index 639e9831c..4293db9f3 100644 --- a/apps/emqx_web_hook/mix.exs +++ b/apps/emqx_web_hook/mix.exs @@ -1,4 +1,4 @@ -defmodule EmqxWebHook.MixProject do +defmodule EMQXWebHook.MixProject do use Mix.Project def project do diff --git a/mix.exs b/mix.exs index f46eb0e48..e69abe483 100644 --- a/mix.exs +++ b/mix.exs @@ -1,4 +1,4 @@ -defmodule EmqxUmbrella.MixProject do +defmodule EMQXUmbrella.MixProject do use Mix.Project def project do