Skip to content

Commit

Permalink
Merge pull request #82 from Annopaolo/update_elixir_deps
Browse files Browse the repository at this point in the history
Update Elixir and dependencies
  • Loading branch information
bettio authored Nov 22, 2023
2 parents e5f4eb1 + 6a800a8 commit def7641
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
pull_request:

env:
elixir_version: "1.14.5"
elixir_version: "1.15.7"
otp_version: "25.3.2"

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
elixir 1.14.5-otp-25
elixir 1.15.7-otp-25
erlang 25.3.2
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
Inflight messages are discarded. After deletion, a device must be
registered again in order to connect to Astarte.

### Changed
- Update Elixir to 1.15.7.

## [1.1.0] - 2023-06-20

## [1.1.0-rc.0] - 2023-06-09
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM hexpm/elixir:1.14.5-erlang-25.3.2-debian-bullseye-20230522-slim as builder
FROM hexpm/elixir:1.15.7-erlang-25.3.2.7-debian-bullseye-20231009-slim as builder

# install build dependencies
# --allow-releaseinfo-change allows to pull from 'oldstable'
Expand Down
2 changes: 1 addition & 1 deletion lib/astarte_vmq_plugin.ex
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ defmodule Astarte.VMQ.Plugin do
[]
end

mountpoint = ''
mountpoint = ~c""
subscriber_id = {mountpoint, client_id}

case :vernemq_dev_api.disconnect_by_subscriber_id(subscriber_id, opts) do
Expand Down
4 changes: 2 additions & 2 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ defmodule Astarte.VMQ.Plugin.Mixfile do
[
app: :astarte_vmq_plugin,
version: "1.2.0-dev",
elixir: "~> 1.14",
elixir: "~> 1.15",
elixirc_paths: elixirc_paths(Mix.env()),
start_permanent: Mix.env() == :prod,
test_coverage: [tool: ExCoveralls],
Expand Down Expand Up @@ -78,7 +78,7 @@ defmodule Astarte.VMQ.Plugin.Mixfile do

defp astarte_required_modules(_) do
[
{:astarte_rpc, github: "Annopaolo/astarte_rpc", branch: "delete-device"},
{:astarte_rpc, github: "astarte-platform/astarte_rpc"},
{:astarte_core, github: "astarte-platform/astarte_core"}
]
end
Expand Down
6 changes: 3 additions & 3 deletions mix.lock
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
%{
"amqp": {:hex, :amqp, "2.1.2", "eab047abb54f7e30022b81b9534b797e51c6e7756f1b112ec6dcee3c3ac20eac", [:mix], [{:amqp_client, "~> 3.8.0", [hex: :amqp_client, repo: "hexpm", optional: false]}], "hexpm", "535901c611a979221d045839e9e7a661bf33d04590b796c8fa30f487511fde04"},
"amqp_client": {:hex, :amqp_client, "3.8.35", "e81dbec62057155b5aff857ac9ee85a63af2baf6e0fd4e9d02a3aff46a3de836", [:make, :rebar3], [{:rabbit_common, "3.8.35", [hex: :rabbit_common, repo: "hexpm", optional: false]}], "hexpm", "ca8066e8d12530e31a9879789bc44bb2a4877dcd2d4b65e56b3d301b5e727688"},
"astarte_core": {:git, "https://github.com/astarte-platform/astarte_core.git", "4fcb19e67b5afcaeba569d28847a6756f017c3e2", []},
"astarte_rpc": {:git, "https://github.com/Annopaolo/astarte_rpc.git", "381fcab135b0b749a9e37d8467300273b189ddaf", [branch: "delete-device"]},
"astarte_core": {:git, "https://github.com/astarte-platform/astarte_core.git", "5ceb239cf49aaad9eaca1bfbcfcb322d5518c438", []},
"astarte_rpc": {:git, "https://github.com/astarte-platform/astarte_rpc.git", "d78843a00b1cd4f1e06d42cd9fa51e5f68a2c837", []},
"castore": {:hex, :castore, "0.1.22", "4127549e411bedd012ca3a308dede574f43819fe9394254ca55ab4895abfa1a2", [:mix], [], "hexpm", "c17576df47eb5aa1ee40cc4134316a99f5cad3e215d5c77b8dd3cfef12a22cac"},
"certifi": {:hex, :certifi, "2.9.0", "6f2a475689dd47f19fb74334859d460a2dc4e3252a3324bd2111b8f0429e7e21", [:rebar3], [], "hexpm", "266da46bdb06d6c6d35fde799bcb28d36d985d424ad7c08b5bb48f5b5cdd4641"},
"credentials_obfuscation": {:hex, :credentials_obfuscation, "3.1.0", "2c405ea0c5db7b3344aa5a99f86c33e7b6ecea97d2cb613371e1cf0d192ef2c6", [:rebar3], [], "hexpm", "04884e62b1c6cdfba999d4d6b3e99bc0a59d5e439517bc5c01767255afb7b778"},
Expand Down Expand Up @@ -31,7 +31,7 @@
"rabbit_common": {:hex, :rabbit_common, "3.8.35", "392b43d3242bc9b02b6889be1726ce9ee6bb8e9a226e20253cd8512a147fa765", [:make, :rebar3], [{:credentials_obfuscation, "3.1.0", [hex: :credentials_obfuscation, repo: "hexpm", optional: false]}, {:jsx, "3.1.0", [hex: :jsx, repo: "hexpm", optional: false]}, {:lager, "3.9.2", [hex: :lager, repo: "hexpm", optional: false]}, {:recon, "2.5.1", [hex: :recon, repo: "hexpm", optional: false]}], "hexpm", "aa79691f95bc86f6383fea2be6a781c1c5efa76d3e6cc0670af2232d8515baac"},
"recon": {:hex, :recon, "2.5.1", "430ffa60685ac1efdfb1fe4c97b8767c92d0d92e6e7c3e8621559ba77598678a", [:mix, :rebar3], [], "hexpm", "5721c6b6d50122d8f68cccac712caa1231f97894bab779eff5ff0f886cb44648"},
"skogsra": {:hex, :skogsra, "2.4.1", "50f0e984d7560ffab30f8f5bb66e177a75d2dc72ed12de373aed7b6dfb54fb8c", [:mix], [{:jason, "~> 1.3", [hex: :jason, repo: "hexpm", optional: true]}, {:yamerl, "~> 0.10", [hex: :yamerl, repo: "hexpm", optional: true]}], "hexpm", "ffef5de2bfb1618babf692803acdd158cc081324735e28deea982dc87c9e565f"},
"ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.6", "cf344f5692c82d2cd7554f5ec8fd961548d4fd09e7d22f5b62482e5aeaebd4b0", [:make, :mix, :rebar3], [], "hexpm", "bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680"},
"ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.7", "354c321cf377240c7b8716899e182ce4890c5938111a1296add3ec74cf1715df", [:make, :mix, :rebar3], [], "hexpm", "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"},
"telemetry": {:hex, :telemetry, "1.2.1", "68fdfe8d8f05a8428483a97d7aab2f268aaff24b49e0f599faa091f1d4e7f61c", [:rebar3], [], "hexpm", "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"},
"unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
"vernemq_dev": {:git, "https://github.com/vernemq/vernemq_dev.git", "6d622aa8c901ae7777433aef2bd049e380c474a6", []},
Expand Down
6 changes: 3 additions & 3 deletions test/astarte_vmq_plugin/config_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ defmodule Astarte.VMQ.Plugin.ConfigTest do
alias Astarte.VMQ.Plugin.Config

test "config init correctly converts amqp_options to elixir strings" do
opts = [username: 'user', password: 'password', virtual_host: '/']
opts = [username: ~c"user", password: ~c"password", virtual_host: ~c"/"]

old_opts = Config.amqp_options()

Expand All @@ -40,7 +40,7 @@ defmodule Astarte.VMQ.Plugin.ConfigTest do
end

test "config init correctly converts data_queue_prefix to elixir string" do
data_queue_prefix = 'test_erlang_str'
data_queue_prefix = ~c"test_erlang_str"

old_data_queue_prefix = Config.data_queue_prefix()

Expand All @@ -55,7 +55,7 @@ defmodule Astarte.VMQ.Plugin.ConfigTest do
end

test "config init correctly converts cassandra_nodes to elixir string" do
erlang_cassandra_nodes = ['something']
erlang_cassandra_nodes = [~c"something"]

elixir_cassandra_nodes = ["something"]

Expand Down

0 comments on commit def7641

Please sign in to comment.