Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: Elixir CI

on:
pull_request:
branches: [master]
push:
tags:
- 0.*
Expand All @@ -18,13 +17,6 @@ jobs:
matrix:
version:
[
{ elixir: "1.14", otp: "24", os: "ubuntu-22.04" },
{ elixir: "1.14", otp: "25", os: "ubuntu-22.04" },

{ elixir: "1.15", otp: "24", os: "ubuntu-22.04" },
{ elixir: "1.15", otp: "25", os: "ubuntu-22.04" },
{ elixir: "1.15", otp: "26", os: "ubuntu-22.04" },

{ elixir: "1.16", otp: "24", os: "ubuntu-22.04" },
{ elixir: "1.16", otp: "25", os: "ubuntu-22.04" },
{ elixir: "1.16", otp: "26", os: "ubuntu-22.04" },
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,6 @@ erl_crash.dump
# Ignore package tarball (built via "mix hex.build").
storex-*.tar

/.elixir_ls
/.elixir_ls

.DS_Store
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
# storex

## 0.6.2
## 0.7.0

- **[BREAKING]** Updated the minimum required version of Elixir to `1.16`
- Fix type warnings emitted by `use Storex.Store` on Elixir 1.18 and newer
- Removed the `:pg2` fallback, unreachable since OTP 24
- Updated dependencies

## 0.6.1

Expand Down
23 changes: 6 additions & 17 deletions lib/storex.ex
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,16 @@ defmodule Storex do
def start(_type, _args) do
import Supervisor.Spec, warn: false

children =
pg_children() ++
[
{Storex.PG, []},
{Storex.Registry, []},
{Storex.Supervisor, []}
]
children = [
Comment on lines 5 to +8
%{id: :pg, start: {:pg, :start_link, [Storex.PG]}},
{Storex.PG, []},
{Storex.Registry, []},
{Storex.Supervisor, []}
]

Supervisor.start_link(children, strategy: :one_for_one, name: __MODULE__)
end

if Code.ensure_loaded?(:pg) do
defp pg_children() do
[%{id: :pg, start: {:pg, :start_link, [Storex.PG]}}]
end
else
defp pg_children() do
[]
end
end

@doc """
Mutate store from elixir.

Expand Down
27 changes: 2 additions & 25 deletions lib/storex/pg.ex
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ defmodule Storex.PG do

@impl true
def init(_) do
:ok = pg_join(@name)
:ok = :pg.join(Storex.PG, @name, self())
{:ok, @name}
end

def broadcast(payload) do
pg_members(@name)
:pg.get_members(Storex.PG, @name)
|> case do
{:error, _} ->
:error
Expand Down Expand Up @@ -51,27 +51,4 @@ defmodule Storex.PG do
def handle_info(_, state) do
{:noreply, state}
end

if Code.ensure_loaded?(:pg) do
defp pg_members(group) do
:pg.get_members(Storex.PG, group)
end
else
defp pg_members(group) do
:pg2.get_members({:storex, group})
end
end

if Code.ensure_loaded?(:pg) do
defp pg_join(group) do
:ok = :pg.join(Storex.PG, group, self())
end
else
defp pg_join(group) do
namespace = {:storex, group}
:ok = :pg2.create(namespace)
:ok = :pg2.join(namespace, self())
:ok
end
end
end
4 changes: 2 additions & 2 deletions mix.exs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
defmodule Storex.MixProject do
use Mix.Project

@version "0.6.2"
@version "0.7.0"

def project do
[
app: :storex,
version: @version,
elixir: "~> 1.10",
elixir: "~> 1.16",
elixirc_paths: elixirc_paths(Mix.env()),
start_permanent: Mix.env() == :prod,
deps: deps(),
Expand Down
57 changes: 28 additions & 29 deletions mix.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "storex",
"version": "0.6.2",
"version": "0.7.0",
"main": "./priv/static/storex.umd.js",
"module": "./priv/static/storex.esm.js",
"types": "./priv/static/storex.d.ts",
Expand Down
Loading