catch up with rebar 3.18 internal API changes

rebar.config

@@ -3,7 +3,7 @@
     warnings_as_errors]}.
 
 {deps, [
-        {cuttlefish, {git,"https://github.com/basho/cuttlefish.git", {branch, "develop-3.0"}}}
+        {cuttlefish, {git,"https://github.com/TI-Tokyo/cuttlefish.git", {tag, "2.2.1rc1"}}}
        ]}.
 
 {xref_checks, [

src/rebar3_cuttlefish_release.erl

@@ -1,9 +1,10 @@
 -module(rebar3_cuttlefish_release).
 -behaviour(provider).
 
--export([init/1
-        ,do/1
-        ,format_error/1]).
+-export([ init/1
+        , do/1
+        , format_error/1
+        ]).
 
 -define(PROVIDER, release).
 -define(NAMESPACE, default).
@@ -22,7 +23,7 @@ init(State) ->
             {bare, true},                 % The task can be run by the user, always true
             {deps, ?DEPS},                % The list of dependencies
             {example, "rebar3 cuttlefish release"}, % How to use the plugin
-            {opts, relx:opt_spec_list()},                   % list of options understood by the plugin
+            {opts, rebar_relx:opt_spec_list()},     % list of options understood by the plugin
             {short_desc, "Rebar3 cuttlefish release plugin"},
             {desc, ""}
     ]),
@@ -99,7 +100,7 @@ do(State) ->
     State1 = rebar_state:set(State, relx, lists:keydelete(overlay, 1, Relx) ++
                                  [{generate_start_script, DisableCFRelScripts},
                                   {overlay, Overlays3} | StartHookState]),
-    Res = rebar_relx:do(rlx_prv_release, "release", ?PROVIDER, State1),
+    Res = rebar_relx:do(?PROVIDER, State1),
     SchemaGlob = filename:join([TargetDir, "share", "schema", "*.schema"]),
     ReleaseSchemas = filelib:wildcard(SchemaGlob),
 
@@ -117,6 +118,8 @@ do(State) ->
             Res
     end.
 
+
+
 -spec format_error(any()) ->  iolist().
 format_error({no_cuttlefish_escript, ProfileDir}) ->
     io_lib:format("No cuttlefish escript found under ~s or ~s", [filename:join(ProfileDir, "bin"),
@@ -162,7 +165,7 @@ maybe_set_startup_hook(false, _State) ->
     [{sys_config, false}, {vm_args, false}];
 maybe_set_startup_hook(true, State) ->
     RelxState = rebar_state:get(State, relx),
-    StartHooks0 = 
+    StartHooks0 =
         case lists:keyfind(extended_start_script_hooks, 1, RelxState) of
             {extended_start_script_hooks, StartHooks1} ->
                 do_set_start_hook(StartHooks1);

src/rebar3_cuttlefish_tar.erl

@@ -1,9 +1,10 @@
 -module(rebar3_cuttlefish_tar).
 -behaviour(provider).
 
--export([init/1
-        ,do/1
-        ,format_error/1]).
+-export([ init/1
+        , do/1
+        , format_error/1
+        ]).
 
 -define(PROVIDER, tar).
 -define(NAMESPACE, default).
@@ -21,7 +22,7 @@ init(State) ->
             {bare, true},                 % The task can be run by the user, always true
             {deps, ?DEPS},                % The list of dependencies
             {example, "rebar3 cuttlefish tar"}, % How to use the plugin
-            {opts, relx:opt_spec_list()},                   % list of options understood by the plugin
+            {opts, rebar_relx:opt_spec_list()}, % list of options understood by the plugin
             {short_desc, "Rebar3 cuttlefish release tarball plugin"},
             {desc, ""}
     ]),
@@ -30,7 +31,8 @@ init(State) ->
 
 -spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
 do(State) ->
-    rebar_relx:do(rlx_prv_release, "tar", ?PROVIDER, State).
+    rebar_relx:do(?PROVIDER, State).
+
 
 -spec format_error(any()) ->  iolist().
 format_error(Error) ->