From bb9f44c728a281f6180d6b52f0d714ca8e9824a1 Mon Sep 17 00:00:00 2001
From: Michael Klishin <michael@clojurewerkz.org>
Date: Sat, 21 Dec 2019 18:27:39 +0300
Subject: [PATCH] Ignore deprecation warnings for a few more http_uri funs

Switching to uri_string as the warning suggest
would ruin OTP 20 compatibility.
---
 src/r3_hex_api.erl         | 2 +-
 src/rebar_git_resource.erl | 5 ++++-
 src/rebar_utils.erl        | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/r3_hex_api.erl b/src/r3_hex_api.erl
index 42818b9b..66a08858 100644
--- a/src/r3_hex_api.erl
+++ b/src/r3_hex_api.erl
@@ -28,7 +28,7 @@ put(Config, Path, Body) ->
 delete(Config, Path) ->
     request(Config, delete, Path, undefined).
 
--compile({nowarn_deprecated_function, [http_uri, encode, 1]}).
+-compile({nowarn_deprecated_function, [{http_uri, encode, 1}]}).
 
 %% @private
 encode_query_string(List) ->
diff --git a/src/rebar_git_resource.erl b/src/rebar_git_resource.erl
index 4e81c054..b2769746 100644
--- a/src/rebar_git_resource.erl
+++ b/src/rebar_git_resource.erl
@@ -100,6 +100,9 @@ compare_url(Dir, Url) ->
     ?DEBUG("Comparing git url ~p with ~p", [ParsedUrl, ParsedCurrentUrl]),
     ParsedCurrentUrl =:= ParsedUrl.
 
+-compile({nowarn_deprecated_function, [{http_uri, parse, 2},
+                                       {http_uri, scheme_defaults, 0}]}).
+
 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 +354,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
index 7b267e37..af52f428 100644
--- a/src/rebar_utils.erl
+++ b/src/rebar_utils.erl
@@ -908,6 +908,9 @@ get_http_vars(Scheme) ->
     Config = rebar_config:consult_file(GlobalConfigFile),
     proplists:get_value(Scheme, Config, OS).
 
+-compile({nowarn_deprecated_function, [{http_uri, parse, 1},
+                                       {http_uri, decode, 1}]}).
+
 set_httpc_options() ->
     set_httpc_options(https_proxy, get_http_vars(https_proxy)),
     set_httpc_options(proxy, get_http_vars(http_proxy)).