remove depsolver, provider, escript, etc

.cirrus.yml

@@ -1,8 +1,9 @@
 osx_check_task:
+  name: OSX Tests
   osx_instance:
-    image: mojave-base
+    image: catalina-base
   install_script: brew install erlang
   test_script: |
     wget https://s3.amazonaws.com/rebar3/rebar3
     chmod +x rebar3
-    ./rebar3 eunit && ./rebar3 ct
+    ./rebar3 ct

.github/workflows/main.yml

@@ -1,6 +1,14 @@
-name: CI
+name: Common Test
 
-on: [push]
+on:
+  pull_request:
+    branches:
+      - '4.0.0'
+      - 'master'
+  push:
+    branches:
+      - '4.0.0'
+      - 'master'
 
 jobs:
   build:
@@ -9,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        otp_version: [18, 19, 20, 21, 22]
+        otp_version: [19, 20, 21, 22]
         os: [ubuntu-latest]
 
     container:
@@ -20,4 +28,4 @@ jobs:
     - name: Compile
       run: rebar3 compile
     - name: Run tests
-      run: rebar3 do eunit, ct
+      run: rebar3 ct

README.md

@@ -1,4 +1,5 @@
-[![Build Status](https://api.cirrus-ci.com/github/erlware/relx.svg)](https://cirrus-ci.com/github/erlware/relx)
+![](https://github.com/erlware/relx/workflows/Common%20Test/badge.svg)
+![Cirrus CI - Task and Script Build Status](https://img.shields.io/cirrus/github/erlware/relx?label=OSX%20Tests)
 
 Relx
 =======

examples/relx.config

@@ -73,9 +73,3 @@
 %% will check your app for consistancy so it should be a normal OTP app and
 %% already be built.
 {overrides, [{sexpr, "../sexpr"}]}.
-
-
-%% In some cases you might want to add additional functionality to relx. You
-%% can do this via a 'provider'. A provider is an implementation of the relx
-%% provider behaviour. This probably shouldn't be needed very often.
-{add_providers, [my_custom_functionality]}.

rebar.config

@@ -1,25 +1,12 @@
 %% -*- mode: Erlang; fill-column: 80; comment-column: 75; -*-
 %% Dependencies ================================================================
 {deps, [{erlware_commons, "~>1.2"},
-        {providers, "~>1.8"},
-        {getopt, "~>1.0"},
         {cf, "~>0.3"},
         {bbmustache, "~>1.5"}
        ]}.
 
-{escript_incl_extra, [{"priv/templates/*", "."}]}.
-{escript_emu_args, "%%! +sbtu +A0 -noinput\n"}.
-{escript_incl_apps,
- [getopt, erlware_commons, cf, bbmustache, providers]}.
-
 %% Compiler Options ============================================================
-{erl_opts,
-    [{platform_define, "^[0-9]+", namespaced_types},
-     {platform_define, "^1[8|9]", rand_module},
-     {platform_define, "^2", rand_module},
-     {platform_define, "^2", unicode_str},
-     warnings_as_errors,
-     inline]}.
+{erl_opts, [debug_info, warnings_as_errors, inline]}.
 
 %% Use OTP 18+ when dialyzing relx
 {dialyzer, [{warnings, [unknown]}]}.
@@ -31,42 +18,20 @@
 %% Profiles ====================================================================
 
 {profiles, [{dev, [{plugins, [rebar3_neotoma_plugin]}]},
-
-            {test, [{erl_opts, [nowarn_export_all, debug_info]}]},
-
-            {dialyze, [{overrides, [{add, erlware_commons, [{erl_opts, [debug_info]}]},
-                                    {add, providers, [{erl_opts, [debug_info]}]},
-                                    {add, getopt, [{erl_opts, [debug_info]}]},
-                                    {add, bbmustache, [{erl_opts, [debug_info]}]},
-                                    {add, cf, [{erl_opts, [debug_info]}]}]},
-                       {erl_opts, [debug_info]}]},
-            {escript, [
-                {overrides, [{add, erlware_commons, [{erl_opts, [no_debug_info]}]},
-                             {add, providers, [{erl_opts, [no_debug_info]}]},
-                             {add, getopt, [{erl_opts, [no_debug_info]}]},
-                             {add, bbmustache, [{erl_opts, [no_debug_info]}]},
-                             {add, cf, [{erl_opts, [no_debug_info]}]}]},
-                {erl_opts, [no_debug_info]}
-            ]}
+            {test, [{erl_opts, [nowarn_export_all]}]}
            ]}.
 
-{overrides, [{override, erlware_commons, [
-                                         {erl_opts, [{platform_define, "^[0-9]+", namespaced_types},
-                                                     {platform_define, "^R1[4|5]", deprecated_crypto},
-                                                     {platform_define, "^((1[8|9])|2)", rand_module},
-                                                     {platform_define, "^2", unicode_str},
-                                                     {platform_define, "^(R|1|20)", fun_stacktrace},
-                                                     no_debug_info,
-                                                     warnings_as_errors
-                                                    ]},
-                                         {deps, []}, {plugins, []}
-                                         ]},
-            {override, bbmustache, [
-                                   {erl_opts, [no_debug_info]},
-                                   {deps, []}, {plugins, []}]},
-            {override, getopt, [{erl_opts, [no_debug_info,
-                                            {platform_define, "^2", unicode_str}]}]},
-            {override, providers, [{erl_opts, [no_debug_info]}]}
+{overrides, [{override, erlware_commons,
+              [{erl_opts, [{platform_define, "^[0-9]+", namespaced_types},
+                           {platform_define, "^R1[4|5]", deprecated_crypto},
+                           {platform_define, "^((1[8|9])|2)", rand_module},
+                           {platform_define, "^2", unicode_str},
+                           {platform_define, "^(R|1|20)", fun_stacktrace},
+                           warnings_as_errors
+                          ]},
+               {deps, []}, {plugins, []}
+              ]},
+             {override, bbmustache, [{deps, []}, {plugins, []}]}
             ]}.
 
 {ct_opts, [{cover_spec, "cover.spec"},

rebar.lock

@@ -1,14 +1,10 @@
 {"1.1.0",
 [{<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.5.0">>},0},
  {<<"cf">>,{pkg,<<"cf">>,<<"0.3.1">>},0},
- {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"1.2.0">>},0},
- {<<"getopt">>,{pkg,<<"getopt">>,<<"1.0.1">>},0},
- {<<"providers">>,{pkg,<<"providers">>,<<"1.8.0">>},0}]}.
+ {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"1.2.0">>},0}]}.
 [
 {pkg_hash,[
  {<<"bbmustache">>, <<"8CFDE0602E90A4057E161BF5288ADE854B4E511E2E8924966A8438730E958381">>},
  {<<"cf">>, <<"5CB902239476E141EA70A740340233782D363A31EEA8AD37049561542E6CD641">>},
- {<<"erlware_commons">>, <<"2BAB99CF88941145767A502F1209886F1F0D31695EEF21978A30F15E645721E0">>},
- {<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>},
- {<<"providers">>, <<"923809524B2C156AA3994BC43588BA0E4ED8AD97D7D2A09DEE6B519F5E80A73B">>}]}
+ {<<"erlware_commons">>, <<"2BAB99CF88941145767A502F1209886F1F0D31695EEF21978A30F15E645721E0">>}]}
 ].

src/relx.app.src

@@ -3,7 +3,9 @@
   {vsn,"git"},
   {modules,[]},
   {registered,[]},
-  {applications,[kernel,stdlib,getopt,erlware_commons,bbmustache,
-                 providers]},
+  {applications,[kernel,
+                 stdlib,
+                 erlware_commons,
+                 bbmustache]},
   {licenses,["Apache"]},
   {links,[{"Github","https://github.com/erlware/relx"}]}]}.