diff --git a/mix.exs b/mix.exs index 8d91470..fe7265f 100644 --- a/mix.exs +++ b/mix.exs @@ -36,17 +36,18 @@ defmodule Scrivener.Ecto.Mixfile do ] end - defp applications(:test), do: [:scrivener, :postgrex, :ecto, :logger] + defp applications(:test), do: [:scrivener, :postgrex, :ecto, :logger, :telemetry] defp applications(_), do: [:scrivener, :logger] defp deps do [ {:scrivener, "~> 2.4"}, - {:ecto, git: "https://github.com/elixir-ecto/ecto.git"}, + {:ecto, "~> 3.0-rc"}, + {:ecto_sql, "~> 3.0-rc"}, {:dialyxir, "~> 0.5.0", only: :dev}, {:earmark, ">= 0.0.0", only: :dev}, {:ex_doc, "~> 0.18.0", only: :dev}, - {:postgrex, "~> 0.14.0-dev", github: "elixir-ecto/postgrex", ref: "6cabc3b"} + {:postgrex, "~> 0.14.0-rc"} ] end diff --git a/mix.lock b/mix.lock index a8fb6a7..6394131 100644 --- a/mix.lock +++ b/mix.lock @@ -1,11 +1,13 @@ %{ "connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], [], "hexpm"}, - "db_connection": {:git, "https://github.com/elixir-ecto/db_connection.git", "854d917721b820576da4b74b3620bf359c61179f", [ref: "854d917"]}, + "db_connection": {:hex, :db_connection, "2.0.0-rc.0", "f6960e86b5e524468ec16fb7277e509c784de565ac520213a1813ad2bf7d802f", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}], "hexpm"}, "decimal": {:hex, :decimal, "1.5.0", "b0433a36d0e2430e3d50291b1c65f53c37d56f83665b43d79963684865beab68", [:mix], [], "hexpm"}, "dialyxir": {:hex, :dialyxir, "0.5.1", "b331b091720fd93e878137add264bac4f644e1ddae07a70bf7062c7862c4b952", [:mix], [], "hexpm"}, "earmark": {:hex, :earmark, "1.2.6", "b6da42b3831458d3ecc57314dff3051b080b9b2be88c2e5aa41cd642a5b044ed", [:mix], [], "hexpm"}, - "ecto": {:git, "https://github.com/elixir-ecto/ecto.git", "bba34c5ba218537bf196630179e4934946ab94e0", []}, + "ecto": {:hex, :ecto, "3.0.0-rc.1", "c966a270b289739d6895f61bee339065a3075d1df34ddd369d400cf0c936fd6c", [:mix], [{:decimal, "~> 1.5", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:poison, "~> 2.2 or ~> 3.0", [hex: :poison, repo: "hexpm", optional: true]}], "hexpm"}, + "ecto_sql": {:hex, :ecto_sql, "3.0.0-rc.0", "a61da743812a47174e8b79dbe6aa7d4a9f7e6dbf8c90cfd7015f3767738b37ba", [:mix], [{:db_connection, "~> 2.0-rc.0", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.0.0-rc.1", [hex: :ecto, repo: "hexpm", optional: false]}, {:mariaex, "~> 0.9.0-rc.0", [hex: :mariaex, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.14.0-rc.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.2.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"}, "ex_doc": {:hex, :ex_doc, "0.18.4", "4406b8891cecf1352f49975c6d554e62e4341ceb41b9338949077b0d4a97b949", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}], "hexpm"}, - "postgrex": {:git, "https://github.com/elixir-ecto/postgrex.git", "6cabc3b018cabc6e036e7d162414889a20785b96", [ref: "6cabc3b"]}, + "postgrex": {:hex, :postgrex, "0.14.0-rc.1", "a88cbeab25c5f3fc505fc6590bd30877a5acf11b448aedb23b41cbc063824ceb", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.0-rc.0", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"}, "scrivener": {:hex, :scrivener, "2.5.0", "e1f78c62b6806d91cc9c4778deef1ea4e80aa9fadfce2c16831afe0468cc8a2c", [:mix], [], "hexpm"}, + "telemetry": {:hex, :telemetry, "0.2.0", "5b40caa3efe4deb30fb12d7cd8ed4f556f6d6bd15c374c2366772161311ce377", [:mix], [], "hexpm"}, } diff --git a/test/support/repo.ex b/test/support/repo.ex index 3b1b88e..dd03930 100644 --- a/test/support/repo.ex +++ b/test/support/repo.ex @@ -1,4 +1,4 @@ defmodule Scrivener.Ecto.Repo do - use Ecto.Repo, otp_app: :scrivener_ecto + use Ecto.Repo, otp_app: :scrivener_ecto, adapter: Ecto.Adapters.Postgres use Scrivener, page_size: 5, max_page_size: 10 end