Skip to content

Commit 0cd9bf7

Browse files
authored
Remove compat with pre OTP 22 (#28)
1 parent c21ae6e commit 0cd9bf7

File tree

4 files changed

+12
-27
lines changed

4 files changed

+12
-27
lines changed

rebar.config

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
{require_min_otp_vsn, "22"}.
22

33
{erl_opts, [
4-
debug_info,
5-
6-
{platform_define, "^[0-9]+", namespaced_dicts},
7-
{platform_define, "^(19|2)", rand_only},
8-
{platform_define, "^(R|1|20)", fun_stacktrace}
9-
]
10-
}.
4+
debug_info
5+
]}.
116

127
{deps, [
13-
{erlang_localtime, "1.0.0"},
14-
{zotonic_stdlib, "1.5.3"}
8+
{erlang_localtime, "1.0.0"},
9+
{zotonic_stdlib, "1.6.0"}
1510
]}.
1611

1712
{xref_checks, [

rebar.lock

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,21 @@
22
[{<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.11.0">>},1},
33
{<<"erlang_localtime">>,{pkg,<<"erlang_localtime">>,<<"1.0.0">>},0},
44
{<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.6">>},2},
5-
{<<"tls_certificate_check">>,{pkg,<<"tls_certificate_check">>,<<"1.8.0">>},1},
6-
{<<"zotonic_stdlib">>,{pkg,<<"zotonic_stdlib">>,<<"1.5.3">>},0}]}.
5+
{<<"tls_certificate_check">>,
6+
{pkg,<<"tls_certificate_check">>,<<"1.11.0">>},
7+
1},
8+
{<<"zotonic_stdlib">>,{pkg,<<"zotonic_stdlib">>,<<"1.6.0">>},0}]}.
79
[
810
{pkg_hash,[
911
{<<"cowlib">>, <<"0B9FF9C346629256C42EBE1EEB769A83C6CB771A6EE5960BD110AB0B9B872063">>},
1012
{<<"erlang_localtime">>, <<"497DFD4D13523D3E0EECDCB8D6D59857CF642A17A6BDC6133FF906FDAF2AEF21">>},
1113
{<<"ssl_verify_fun">>, <<"CF344F5692C82D2CD7554F5EC8FD961548D4FD09E7D22F5B62482E5AEAEBD4B0">>},
12-
{<<"tls_certificate_check">>, <<"8A41A435C8055CB11D1D0AC96B34F48377D49FEA2782D70EABCF8946539946A3">>},
13-
{<<"zotonic_stdlib">>, <<"0B02BEFE4728FCC7D8905C9219AB2BA1EEE93A0C9BC67B87647385868EBEE1F8">>}]},
14+
{<<"tls_certificate_check">>, <<"609DCD503F31170F0799DAC380EB0E086388CF918FC769AAA60DDD6BBF575218">>},
15+
{<<"zotonic_stdlib">>, <<"872E85BD2DC8A49A4DA255E4DF6C1B4DDC993E59024D02303BD6A5DF0868859B">>}]},
1416
{pkg_hash_ext,[
1517
{<<"cowlib">>, <<"2B3E9DA0B21C4565751A6D4901C20D1B4CC25CBB7FD50D91D2AB6DD287BC86A9">>},
1618
{<<"erlang_localtime">>, <<"46E3F7B18477B377EC71F9DCD91C4D30FE82A128FFA9F89BE1595D4D08414844">>},
1719
{<<"ssl_verify_fun">>, <<"BDB0D2471F453C88FF3908E7686F86F9BE327D065CC1EC16FA4540197EA04680">>},
18-
{<<"tls_certificate_check">>, <<"5211FD87B4FEFAA77F2DE1F03479CBC4EE8312738A21B9B905253674468928F2">>},
19-
{<<"zotonic_stdlib">>, <<"302B4F69991E8AFE3D3AD8E09E26EC01072BF082AC6D65656D2B00CC1A41CF35">>}]}
20+
{<<"tls_certificate_check">>, <<"4AB962212EF7C87482619CB298E1FE06E047B57F0BD58CC417B3B299EB8D036E">>},
21+
{<<"zotonic_stdlib">>, <<"9139167866615F226C3915B6082B317892E276F3A9C78C5A99CD497FA589444E">>}]}
2022
].

src/template_compiler_internal.hrl

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,3 @@
6161
is_autoescape = false :: boolean()
6262
}).
6363

64-
65-
-ifdef(fun_stacktrace).
66-
-define(WITH_STACKTRACE(T, R, S), T:R -> S = erlang:get_stacktrace(),).
67-
-else.
68-
-define(WITH_STACKTRACE(T, R, S), T:R:S ->).
69-
-endif.
70-

src/template_compiler_runtime_internal.erl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -267,10 +267,5 @@ unique() ->
267267
<<"u", (integer_to_binary(rand_uniform(100000000000000000), 36))/binary>>.
268268

269269
-spec rand_uniform( pos_integer() ) -> non_neg_integer().
270-
-ifdef(rand_only).
271270
rand_uniform(N) ->
272271
rand:uniform(N) - 1.
273-
-else.
274-
rand_uniform(N) ->
275-
crypto:rand_uniform(0,N).
276-
-endif.

0 commit comments

Comments
 (0)