Merge pull request #8 from esl/otp24

Otp24

.github/workflows/CI.yml

@@ -11,8 +11,10 @@ jobs:
  name: OTP ${{matrix.otp}}
  strategy:
  matrix:
- otp: ['22.3', '21.3']
+ otp: ['24.0', '23.3', '22.3', '21.3']
  runs-on: 'ubuntu-20.04'
+ env:
+ OTPVER: ${{ matrix.otp }}
  steps:
  - uses: actions/checkout@v2
  - uses: ErlGang/[email protected]

Makefile

@@ -1,5 +1,10 @@
 .PHONY: all test generate validate compile console dialyzer xref
 
+REBARVER = 3.13.2
+ifeq ($(OTPVER),24.0)
+ REBARVER = 3.15.1
+endif
+
 OutputDir ?= tmp
 
 define openapi-generator
@@ -20,14 +25,18 @@ generate:
 validate:
  $(openapi-generator) validate -i openapi.yaml
 
-compile:
+compile: rebar3
  ./rebar3 compile
 
-console:
+console: rebar3
  ./rebar3 shell --apps=amoc_rest
 
-dialyzer:
+rebar3:
+ wget https://github.com/erlang/rebar3/releases/download/${REBARVER}/rebar3 &&\
+ chmod u+x rebar3
+
+dialyzer: rebar3
  ./rebar3 dialyzer
 
-xref:
+xref: rebar3
  ./rebar3 xref

rebar.config

@@ -1,8 +1,8 @@
 {deps, [
- {cowboy, "2.8.0"},
- {rfc3339, {git, "https://github.com/talentdeficit/rfc3339.git", {branch, "master"}}},
- {jsx, "2.11.0"},
- {jesse, "1.5.5"}
+ {cowboy, "2.9.0"},
+ {rfc3339, "0.9.0"},
+ {jsx, "3.1.0"},
+ {jesse, "1.5.6"}
 ]}.
 
 {xref_checks, [

rebar.lock

@@ -1,18 +1,23 @@
-{"1.1.0",
-[{<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.8.0">>},0},
- {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.9.1">>},1},
- {<<"jesse">>,{pkg,<<"jesse">>,<<"1.5.5">>},0},
- {<<"jsx">>,{pkg,<<"jsx">>,<<"2.11.0">>},0},
- {<<"ranch">>,{pkg,<<"ranch">>,<<"1.7.1">>},1},
- {<<"rfc3339">>,
- {git,"https://github.com/talentdeficit/rfc3339.git",
- {ref,"31716adecb4b405b1f5ef80b9f3fa50f39b26af8"}},
- 0}]}.
+{"1.2.0",
+[{<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.9.0">>},0},
+ {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.11.0">>},1},
+ {<<"jesse">>,{pkg,<<"jesse">>,<<"1.5.6">>},0},
+ {<<"jsx">>,{pkg,<<"jsx">>,<<"3.1.0">>},0},
+ {<<"ranch">>,{pkg,<<"ranch">>,<<"1.8.0">>},1},
+ {<<"rfc3339">>,{pkg,<<"rfc3339">>,<<"0.9.0">>},0}]}.
 [
 {pkg_hash,[
- {<<"cowboy">>, <<"F3DC62E35797ECD9AC1B50DB74611193C29815401E53BAC9A5C0577BD7BC667D">>},
- {<<"cowlib">>, <<"61A6C7C50CF07FDD24B2F45B89500BB93B6686579B069A89F88CB211E1125C78">>},
- {<<"jesse">>, <<"ECFD2C1634C49052CA907B4DFDE1D1F44B7FD7862D933F4590807E42759B8072">>},
- {<<"jsx">>, <<"08154624050333919B4AC1B789667D5F4DB166DC50E190C4D778D1587F102EE0">>},
- {<<"ranch">>, <<"6B1FAB51B49196860B733A49C07604465A47BDB78AA10C1C16A3D199F7F8C881">>}]}
+ {<<"cowboy">>, <<"865DD8B6607E14CF03282E10E934023A1BD8BE6F6BACF921A7E2A96D800CD452">>},
+ {<<"cowlib">>, <<"0B9FF9C346629256C42EBE1EEB769A83C6CB771A6EE5960BD110AB0B9B872063">>},
+ {<<"jesse">>, <<"593B8CAD26AF3CC0E44C727BD8CBDE56E2B0DE4C8D2738B1C258B6936A40A6A3">>},
+ {<<"jsx">>, <<"D12516BAA0BB23A59BB35DCCAF02A1BD08243FCBB9EFE24F2D9D056CCFF71268">>},
+ {<<"ranch">>, <<"8C7A100A139FD57F17327B6413E4167AC559FBC04CA7448E9BE9057311597A1D">>},
+ {<<"rfc3339">>, <<"2075653DC9407541C84B1E15F8BDA2ABE95FB17C9694025E079583F2D19C1060">>}]},
+{pkg_hash_ext,[
+ {<<"cowboy">>, <<"2C729F934B4E1AA149AFF882F57C6372C15399A20D54F65C8D67BEF583021BDE">>},
+ {<<"cowlib">>, <<"2B3E9DA0B21C4565751A6D4901C20D1B4CC25CBB7FD50D91D2AB6DD287BC86A9">>},
+ {<<"jesse">>, <<"3F9475B0C5B242E09592604AABB03328501D7E3D8A528173B5A75396EEDB0060">>},
+ {<<"jsx">>, <<"0C5CC8FDC11B53CC25CF65AC6705AD39E54ECC56D1C22E4ADB8F5A53FB9427F3">>},
+ {<<"ranch">>, <<"49FBCFD3682FAB1F5D109351B61257676DA1A2FDBE295904176D5E521A2DDFE5">>},
+ {<<"rfc3339">>, <<"182314DE35C9F4180B22EB5F22916D8D7A799C1109A060C752970273A9332AD6">>}]}
 ].