Skip to content

Commit

Permalink
fix(deps): remove ash_uuid
Browse files Browse the repository at this point in the history
  • Loading branch information
mbaertschi committed Aug 7, 2024
1 parent b488b1b commit 3a3dad3
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 19 deletions.
1 change: 0 additions & 1 deletion .formatter.exs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import_deps: [
:ash,
:ash_phoenix,
:ash_uuid,
:phoenix
],
plugins: [
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ you need to either `use AshPagify.Tsearch` in your module or implement the `full
defmodule YourApp.Resource.Post
# only required if you want to implement full-text search
use AshPagify.Tsearch
require Ash.Query
require Ash.Expr

@default_limit 15
def default_limit, do: @default_limit
Expand Down
8 changes: 0 additions & 8 deletions config/config.exs
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@ config :ash_pagify,
ash_domains: [],
env: Mix.env()

config :ash_uuid, :otp_app, :ash_pagify

config :ash_pagify, :ash_uuid,
version: 7,
encoded?: true,
prefixed?: true,
migration_default?: true

config :logger, :console,
format: "$time $metadata[$level] $message\n",
metadata: [:request_id]
Expand Down
7 changes: 3 additions & 4 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,9 @@ defmodule AshPagify.MixProject do
defp deps do
[
# Ash Framework
{:ash, "~> 3.3.3", override: true},
{:ash_phoenix, "~> 2.1.1"},
{:ash_postgres, "~> 2.1.17", override: true},
{:ash_uuid, "~> 1.1.1", override: true},
{:ash, "~> 3.3"},
{:ash_phoenix, "~> 2.1"},
{:ash_postgres, "~> 2.1"},

# SAT Solvers
{:picosat_elixir, "~> 0.2", optional: true},
Expand Down
2 changes: 0 additions & 2 deletions mix.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"ash_phoenix": {:hex, :ash_phoenix, "2.1.1", "36521a99b602b0531dfc9ebd9ee90d10bbead9a3ffd1c6dffbacb0751553a2c0", [:mix], [{:ash, "~> 3.0", [hex: :ash, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.5.6 or ~> 1.6", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.20.3 or ~> 1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "02d1b270aa0f78c5db6f1db9f3112d349a10b729b116911df47e39f11e2ae62d"},
"ash_postgres": {:hex, :ash_postgres, "2.1.17", "ab49498861389717bab70eb85161600cbcd8fed34b626186462b89e59dfe4af0", [:mix], [{:ash, "~> 3.3", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_sql, ">= 0.2.28 and < 1.0.0-0", [hex: :ash_sql, repo: "hexpm", optional: false]}, {:ecto, ">= 3.11.2 and < 4.0.0-0", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, ">= 3.11.3 and < 4.0.0-0", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:igniter, ">= 0.3.6 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, ">= 0.0.0", [hex: :postgrex, repo: "hexpm", optional: false]}], "hexpm", "494bb1c4cbc9a55f7bf888543b136840cea65136feac2fe2246eba971e2a28ca"},
"ash_sql": {:hex, :ash_sql, "0.2.29", "d99a40818667d1843e61edae6b3eeeaedda62f34e6477e4dd29017f81fddbf07", [:mix], [{:ash, ">= 3.1.7 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}, {:ecto, "~> 3.9", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.9", [hex: :ecto_sql, repo: "hexpm", optional: false]}], "hexpm", "1d3cc1c3a26cf87bb913fdf7bcbe9d901d35f260aac36225b8054541836e5752"},
"ash_uuid": {:hex, :ash_uuid, "1.1.1", "4bd5371504150b84dbf36458a357421b5dc2e6d330c718619d0735770cb14412", [:mix], [{:ash, "~> 3.0.0", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_postgres, "~> 2.0.11", [hex: :ash_postgres, repo: "hexpm", optional: false]}, {:uniq, "~> 0.6", [hex: :uniq, repo: "hexpm", optional: false]}], "hexpm", "452771906e94e1a9b9bb48ca869cfbd245e2ffde816c7edbee2d84268cef11ad"},
"assertions": {:hex, :assertions, "0.20.1", "e6bfcefbf199bc760d273d5a204ad9ef8a4f6c2b4725fc51d10610d73062e57b", [:mix], [], "hexpm", "848284fbde52f752232d73b8f77060ad191e1a98c177873c4b8dc56c4958defd"},
"blankable": {:hex, :blankable, "1.0.0", "89ab564a63c55af117e115144e3b3b57eb53ad43ba0f15553357eb283e0ed425", [:mix], [], "hexpm", "7cf11aac0e44f4eedbee0c15c1d37d94c090cb72a8d9fddf9f7aec30f9278899"},
"bunt": {:hex, :bunt, "1.0.0", "081c2c665f086849e6d57900292b3a161727ab40431219529f13c4ddcf3e7a44", [:mix], [], "hexpm", "dc5f86aa08a5f6fa6b8096f0735c4e76d54ae5c9fa2c143e5a1fc7c1cd9bb6b5"},
Expand Down Expand Up @@ -64,7 +63,6 @@
"telemetry": {:hex, :telemetry, "1.2.1", "68fdfe8d8f05a8428483a97d7aab2f268aaff24b49e0f599faa091f1d4e7f61c", [:rebar3], [], "hexpm", "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"},
"typable": {:hex, :typable, "0.3.0", "0431e121d124cd26f312123e313d2689b9a5322b15add65d424c07779eaa3ca1", [:mix], [], "hexpm", "880a0797752da1a4c508ac48f94711e04c86156f498065a83d160eef945858f8"},
"ucwidth": {:hex, :ucwidth, "0.2.0", "1f0a440f541d895dff142275b96355f7e91e15bca525d4a0cc788ea51f0e3441", [:mix], [], "hexpm", "c1efd1798b8eeb11fb2bec3cafa3dd9c0c3647bee020543f0340b996177355bf"},
"uniq": {:hex, :uniq, "0.6.1", "369660ecbc19051be526df3aa85dc393af5f61f45209bce2fa6d7adb051ae03c", [:mix], [{:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm", "6426c34d677054b3056947125b22e0daafd10367b85f349e24ac60f44effb916"},
"websock": {:hex, :websock, "0.5.3", "2f69a6ebe810328555b6fe5c831a851f485e303a7c8ce6c5f675abeb20ebdadc", [:mix], [], "hexpm", "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"},
"websock_adapter": {:hex, :websock_adapter, "0.5.6", "0437fe56e093fd4ac422de33bf8fc89f7bc1416a3f2d732d8b2c8fd54792fe60", [:mix], [{:bandit, ">= 0.6.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "e04378d26b0af627817ae84c92083b7e97aca3121196679b73c73b99d0d133ea"},
"yamerl": {:hex, :yamerl, "0.10.0", "4ff81fee2f1f6a46f1700c0d880b24d193ddb74bd14ef42cb0bcf46e81ef2f8e", [:rebar3], [], "hexpm", "346adb2963f1051dc837a2364e4acf6eb7d80097c0f53cbdc3046ec8ec4b4e6e"},
Expand Down
2 changes: 1 addition & 1 deletion test/support/factory/comment.ex
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ defmodule AshPagify.Factory.Comment do
end

attributes do
uuid_attribute :id, public?: true
uuid_primary_key :id, writable?: true
attribute :body, :string, allow_nil?: false, public?: true
attribute :text, :string, public?: true
end
Expand Down
2 changes: 1 addition & 1 deletion test/support/factory/post.ex
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ defmodule AshPagify.Factory.Post do
end

attributes do
uuid_attribute :id, public?: true
uuid_primary_key :id, writable?: true
attribute :name, :string, allow_nil?: false, public?: true
attribute :title, :string, public?: true
attribute :text, :string, public?: true
Expand Down
2 changes: 1 addition & 1 deletion test/support/factory/user.ex
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ defmodule AshPagify.Factory.User do
end

attributes do
uuid_attribute :id, public?: true
uuid_primary_key :id, writable?: true
attribute :name, :string, allow_nil?: false, public?: true
attribute :email, :string, allow_nil?: false, public?: true
attribute :age, :integer, public?: true
Expand Down

0 comments on commit 3a3dad3

Please sign in to comment.