From 7d39b0c478159cfa1d98ed1982bb52b07336d5ef Mon Sep 17 00:00:00 2001
From: Craig P Jolicoeur <craig@mojotech.com>
Date: Fri, 6 Sep 2024 09:58:13 -0400
Subject: [PATCH] Use fork of scrivener_ecto

Fix issue with using Torch for users who have Ecto >= 3.12.0

* https://github.com/mojotech/torch/issues/479
* https://github.com/drewolson/scrivener_ecto/pull/105
---
 mix.exs  | 2 +-
 mix.lock | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mix.exs b/mix.exs
index 1e204e5..da4adc2 100644
--- a/mix.exs
+++ b/mix.exs
@@ -47,7 +47,7 @@ defmodule Torch.MixProject do
       {:phoenix_html, "~> 4.1"},
       {:phoenix_html_helpers, "~> 1.0"},
       {:gettext, "~> 0.16"},
-      {:scrivener_ecto, github: "mojotech/scrivener_ecto", tag: "v2.7.1"},
+      {:scrivener_ecto, "~> 2.8.0", hex: "torch_scrivener_ecto"},
       {:filtrex, "~> 0.4.1"},
       {:jason, "~> 1.2", only: [:dev, :test]},
       {:excoveralls, ">= 0.0.0", only: [:dev, :test]},
diff --git a/mix.lock b/mix.lock
index f69013b..5ac254d 100644
--- a/mix.lock
+++ b/mix.lock
@@ -39,10 +39,11 @@
   "plug": {:hex, :plug, "1.16.1", "40c74619c12f82736d2214557dedec2e9762029b2438d6d175c5074c933edc9d", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a13ff6b9006b03d7e33874945b2755253841b238c34071ed85b0e86057f8cddc"},
   "plug_crypto": {:hex, :plug_crypto, "2.1.0", "f44309c2b06d249c27c8d3f65cfe08158ade08418cf540fd4f72d4d6863abb7b", [:mix], [], "hexpm", "131216a4b030b8f8ce0f26038bc4421ae60e4bb95c5cf5395e1421437824c4fa"},
   "scrivener": {:hex, :scrivener, "2.7.2", "1d913c965ec352650a7f864ad7fd8d80462f76a32f33d57d1e48bc5e9d40aba2", [:mix], [], "hexpm", "7866a0ec4d40274efbee1db8bead13a995ea4926ecd8203345af8f90d2b620d9"},
-  "scrivener_ecto": {:git, "https://github.com/mojotech/scrivener_ecto.git", "24b7b69e9e661b10a9d67feb8b9d6a20ce32c3e4", [tag: "v2.7.1"]},
+  "scrivener_ecto": {:hex, :torch_scrivener_ecto, "2.8.0", "909b1ae390f2aac898fa6aa82e864d4f8cdd415b11f0eeb2939597479f2e4cae", [:mix], [{:ecto, "~> 3.3", [hex: :ecto, repo: "hexpm", optional: false]}, {:scrivener, "~> 2.4", [hex: :scrivener, repo: "hexpm", optional: false]}], "hexpm", "7bb5f4d1b55dc3cbed2cc827877a369cabceb9ff09e6d7fd28646be0aa7ab649"},
   "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.7", "354c321cf377240c7b8716899e182ce4890c5938111a1296add3ec74cf1715df", [:make, :mix, :rebar3], [], "hexpm", "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"},
   "telemetry": {:hex, :telemetry, "1.3.0", "fedebbae410d715cf8e7062c96a1ef32ec22e764197f70cda73d82778d61e7a2", [:rebar3], [], "hexpm", "7015fc8919dbe63764f4b4b87a95b7c0996bd539e0d499be6ec9d7f3875b79e6"},
   "timex": {:hex, :timex, "3.7.11", "bb95cb4eb1d06e27346325de506bcc6c30f9c6dea40d1ebe390b262fad1862d1", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.20", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 1.1", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm", "8b9024f7efbabaf9bd7aa04f65cf8dcd7c9818ca5737677c7b76acbc6a94d1aa"},
+  "torch_scrivener_ecto": {:hex, :torch_scrivener_ecto, "2.8.0", "909b1ae390f2aac898fa6aa82e864d4f8cdd415b11f0eeb2939597479f2e4cae", [:mix], [{:ecto, "~> 3.3", [hex: :ecto, repo: "hexpm", optional: false]}, {:scrivener, "~> 2.4", [hex: :scrivener, repo: "hexpm", optional: false]}], "hexpm", "7bb5f4d1b55dc3cbed2cc827877a369cabceb9ff09e6d7fd28646be0aa7ab649"},
   "tzdata": {:hex, :tzdata, "1.1.1", "20c8043476dfda8504952d00adac41c6eda23912278add38edc140ae0c5bcc46", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "a69cec8352eafcd2e198dea28a34113b60fdc6cb57eb5ad65c10292a6ba89787"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
   "websock": {:hex, :websock, "0.5.3", "2f69a6ebe810328555b6fe5c831a851f485e303a7c8ce6c5f675abeb20ebdadc", [:mix], [], "hexpm", "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"},