From 126f356f703ecd2dcd7787b6154fa53b437bf05c Mon Sep 17 00:00:00 2001 From: Fred Hebert Date: Wed, 28 Oct 2020 00:48:30 +0000 Subject: [PATCH 1/2] Removes unused REMOTE_PACKAGE_DIR variable closes #2391 Also Removing an unused regex macro --- src/rebar.hrl | 1 - src/rebar_compiler.erl | 3 --- 2 files changed, 4 deletions(-) diff --git a/src/rebar.hrl b/src/rebar.hrl index 12629fc4..73a2c20f 100644 --- a/src/rebar.hrl +++ b/src/rebar.hrl @@ -24,7 +24,6 @@ -define(CONFIG_VERSION, "1.2.0"). -define(SUPPORTED_CONFIG_VERSIONS, ["1.1.0", "1.2.0"]). % older were untagged -define(DEFAULT_CDN, "https://repo.hex.pm"). --define(REMOTE_PACKAGE_DIR, "tarballs"). -define(LOCK_FILE, "rebar.lock"). -define(DEFAULT_COMPILER_SOURCE_FORMAT, relative). -define(PACKAGE_INDEX_VERSION, 6). diff --git a/src/rebar_compiler.erl b/src/rebar_compiler.erl index d7081b00..c16313e1 100644 --- a/src/rebar_compiler.erl +++ b/src/rebar_compiler.erl @@ -41,9 +41,6 @@ -optional_callbacks([dependencies/4, compile_and_track/4]). --define(RE_PREFIX, "^(?!\\._)"). - - %% @doc analysis by the caller, in order to let an OTP app %% find and resolve all its dependencies as part of compile_all's new %% API, which presumes a partial analysis is done ahead of time From 17101ca1aa1d46b7e162e80b8e11d014dce0e254 Mon Sep 17 00:00:00 2001 From: Fred Hebert Date: Wed, 28 Oct 2020 00:50:57 +0000 Subject: [PATCH 2/2] bump cth_readable version --- rebar.config | 2 +- rebar.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rebar.config b/rebar.config index 5dcaba9e..8a655ade 100644 --- a/rebar.config +++ b/rebar.config @@ -10,7 +10,7 @@ {bbmustache, "1.10.0"}, {relx, "4.0.2"}, {cf, "0.3.1"}, - {cth_readable, "1.4.8"}, + {cth_readable, "1.4.9"}, {eunit_formatters, "0.5.0"}]}. {post_hooks, [{"(linux|darwin|solaris|freebsd|netbsd|openbsd)", diff --git a/rebar.lock b/rebar.lock index 9ae59daa..e48ff000 100644 --- a/rebar.lock +++ b/rebar.lock @@ -2,7 +2,7 @@ [{<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.10.0">>},0}, {<<"certifi">>,{pkg,<<"certifi">>,<<"2.5.2">>},0}, {<<"cf">>,{pkg,<<"cf">>,<<"0.3.1">>},0}, - {<<"cth_readable">>,{pkg,<<"cth_readable">>,<<"1.4.8">>},0}, + {<<"cth_readable">>,{pkg,<<"cth_readable">>,<<"1.4.9">>},0}, {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"1.3.1">>},0}, {<<"eunit_formatters">>,{pkg,<<"eunit_formatters">>,<<"0.5.0">>},0}, {<<"getopt">>,{pkg,<<"getopt">>,<<"1.0.1">>},0}, @@ -15,7 +15,7 @@ {<<"bbmustache">>, <<"DDC927463F0E95D66CDAC889153AF08015D609124D6D79006C248AD2DE7F6ECD">>}, {<<"certifi">>, <<"B7CFEAE9D2ED395695DD8201C57A2D019C0C43ECAF8B8BCB9320B40D6662F340">>}, {<<"cf">>, <<"5CB902239476E141EA70A740340233782D363A31EEA8AD37049561542E6CD641">>}, - {<<"cth_readable">>, <<"348FBC3110959946539661682127979EC8D25ADA026A95F7ABD336C39BF3E3F9">>}, + {<<"cth_readable">>, <<"034FB69795F11061980ECB62B40EF51DC10D4AC115B98FDB2C0CC71D851FBF98">>}, {<<"erlware_commons">>, <<"0CE192AD69BC6FD0880246D852D0ECE17631E234878011D1586E053641ED4C04">>}, {<<"eunit_formatters">>, <<"6A9133943D36A465D804C1C5B6E6839030434B8879C5600D7DDB5B3BAD4CCB59">>}, {<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>}, @@ -27,7 +27,7 @@ {<<"bbmustache">>, <<"43EFFA3FD4BB9523157AF5A9E2276C493495B8459FC8737144AA186CB13CE2EE">>}, {<<"certifi">>, <<"3B3B5F36493004AC3455966991EAF6E768CE9884693D9968055AEEEB1E575040">>}, {<<"cf">>, <<"315E8D447D3A4B02BCDBFA397AD03BBB988A6E0AA6F44D3ADD0F4E3C3BF97672">>}, - {<<"cth_readable">>, <<"46C3BB14DF581DC7A9DC0CB9E8C755BFF596665FB9A23148DD76E3A200804E90">>}, + {<<"cth_readable">>, <<"B4C6ABABDB046C5F2FBB3C22F030B4C5A679083956DCDD29C1DF0CB30B18DA24">>}, {<<"erlware_commons">>, <<"7AADA93F368D0A0430122E39931B7FB4AC9E94DBF043CDC980AD4330FD9CD166">>}, {<<"eunit_formatters">>, <<"D6C8BA213424944E6E05BBC097C32001CDD0ABE3925D02454F229B20D68763C9">>}, {<<"getopt">>, <<"53E1AB83B9CEB65C9672D3E7A35B8092E9BDC9B3EE80721471A161C10C59959C">>},