Skip to content

Commit 43d3db4

Browse files
committed
Bump dependencies and fix a few warnings.
1 parent 457d2f4 commit 43d3db4

8 files changed

Lines changed: 782 additions & 166 deletions

File tree

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
include:
14-
- erlang: 24.0-alpine-3.13.3
15-
- erlang: 23.2-alpine-3.12.1
16-
- erlang: 22.2.1-alpine-3.12.0
14+
- erlang: 25.0.4-alpine-3.16.1
15+
# - erlang: 24.3.4.4-alpine-3.16.1 # appears to have a broken 'ssl' library
16+
- erlang: 23.3.4.16-alpine-3.16.0
1717

1818
steps:
1919
- uses: actions/checkout@v2

Makefile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
PROJECT = jose
22
PROJECT_DESCRIPTION = JSON Object Signing and Encryption (JOSE) for Erlang and Elixir.
3-
PROJECT_VERSION = 1.9.0
4-
5-
TEST_DEPS = jiffy jsone jsx libdecaf libsodium ojson proper
6-
7-
dep_jiffy = git git://github.com/davisp/jiffy.git master
8-
dep_jsone = git git://github.com/sile/jsone.git master
9-
dep_jsx = git git://github.com/talentdeficit/jsx.git v2.10.0
10-
dep_keccakf1600 = git git://github.com/potatosalad/erlang-keccakf1600.git master
11-
dep_libdecaf = git https://github.com/talklittle/erlang-libdecaf.git otp-23-remove-erl-interface
12-
dep_libsodium = git https://github.com/talklittle/erlang-libsodium.git otp-23-remove-erl-interface
13-
dep_ojson = git git://github.com/potatosalad/erlang-ojson.git master
14-
dep_proper = git git://github.com/proper-testing/proper.git v1.3
3+
PROJECT_VERSION = 1.11.3
4+
5+
TEST_DEPS = jiffy jsone jsx libdecaf ojson proper
6+
7+
dep_jiffy = hex 1.1.1
8+
dep_jsone = hex 1.7.0
9+
dep_jsx = hex 3.1.0
10+
# dep_keccakf1600 = hex 3.0.0
11+
dep_libdecaf = hex 2.1.0
12+
# dep_libsodium = git https://github.com/talklittle/erlang-libsodium.git otp-23-remove-erl-interface
13+
dep_ojson = hex 1.0.0
14+
dep_proper = git https://github.com/proper-testing/proper.git bfd7d862dd5082eeca65c192a7021d0e4de5973e
1515

1616
include erlang.mk
1717

build.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ index/*
1010
core/index
1111
core/deps
1212

13-
# Plugins that must run before Erlang code gets compiled.
14-
plugins/protobuffs
15-
1613
# Core modules, continued.
1714
core/erlc
1815
core/docs
@@ -25,13 +22,16 @@ plugins/asciidoc
2522
plugins/bootstrap
2623
plugins/c_src
2724
plugins/ci
25+
plugins/concuerror
2826
plugins/ct
2927
plugins/dialyzer
3028
plugins/edoc
3129
plugins/erlydtl
3230
plugins/escript
3331
plugins/eunit
32+
plugins/hex
3433
plugins/proper
34+
plugins/protobuffs
3535
plugins/relx
3636
plugins/shell
3737
plugins/sphinx
@@ -47,4 +47,4 @@ plugins/sfx
4747
core/plugins
4848

4949
# Core modules which can use variables from plugins.
50-
core/deps-tools
50+
core/deps-tools

0 commit comments

Comments
 (0)