Merge pull request #2191 from michaelklishin/otp-23-master-compat

OTP 23 [master] compatibility
erlang · Dec 22, 2019 · 1553164 · 1553164
2 parents 3245324 + b93bb35
commit 1553164
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/src/r3_hex_api.erl b/src/r3_hex_api.erl
@@ -28,6 +28,12 @@ put(Config, Path, Body) ->
 delete(Config, Path) ->
     request(Config, delete, Path, undefined).
 
+-ifdef (OTP_RELEASE).
+  -if(?OTP_RELEASE >= 23).
+    -compile({nowarn_deprecated_function, [{http_uri, encode, 1}]}).
+  -endif.
+-endif.
+
 %% @private
 encode_query_string(List) ->
     QueryString =

diff --git a/src/r3_hex_tarball.erl b/src/r3_hex_tarball.erl
@@ -201,7 +201,7 @@ do_unpack(Files, Output) ->
 finish_unpack({error, _} = Error) ->
     Error;
 finish_unpack(#{metadata := Metadata, files := Files, output := Output}) ->
-    _Version = maps:get("VERSION", Files),
+    true = maps:is_key("VERSION", Files),
     Checksum = decode_base16(maps:get("CHECKSUM", Files)),
     ContentsBinary = maps:get("contents.tar.gz", Files),
     case unpack_tarball(ContentsBinary, Output) of

diff --git a/src/rebar_git_resource.erl b/src/rebar_git_resource.erl
@@ -100,6 +100,13 @@ compare_url(Dir, Url) ->
     ?DEBUG("Comparing git url ~p with ~p", [ParsedUrl, ParsedCurrentUrl]),
     ParsedCurrentUrl =:= ParsedUrl.
 
+-ifdef (OTP_RELEASE).
+  -if(?OTP_RELEASE >= 23).
+    -compile({nowarn_deprecated_function, [{http_uri, parse, 2},
+                                           {http_uri, scheme_defaults, 0}]}).
+  -endif.
+-endif.
+
 parse_git_url(Url) ->
     %% Checks for standard scp style git remote
     case re:run(Url, ?SCP_PATTERN, [{capture, [host, path], list}, unicode]) of
@@ -351,7 +358,7 @@ parse_tags(Dir) ->
     end.
 
 git_clone_options() ->
-    Option = case os:getenv("REBAR_GIT_CLONE_OPTIONS") of 
+    Option = case os:getenv("REBAR_GIT_CLONE_OPTIONS") of
         false -> "" ;       %% env var not set
         Opt ->              %% env var set to empty or others
             Opt

diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl
@@ -908,6 +908,13 @@ get_http_vars(Scheme) ->
     Config = rebar_config:consult_file(GlobalConfigFile),
     proplists:get_value(Scheme, Config, OS).
 
+-ifdef (OTP_RELEASE).
+  -if(?OTP_RELEASE >= 23).
+    -compile({nowarn_deprecated_function, [{http_uri, parse, 1},
+                                           {http_uri, decode, 1}]}).
+  -endif.
+-endif.
+
 set_httpc_options() ->
     set_httpc_options(https_proxy, get_http_vars(https_proxy)),
     set_httpc_options(proxy, get_http_vars(http_proxy)).