diff options
author | feld <feld@feld.me> | 2021-06-07 20:06:36 +0000 |
---|---|---|
committer | feld <feld@feld.me> | 2021-06-07 20:06:36 +0000 |
commit | 84f42b92f0f53c569d0f7628d0a4af3ee5c06eaa (patch) | |
tree | 80664a6152e92abb37133fede9e3ed72c6801910 /mix.exs | |
parent | 4ca380490f1e42ef6b12c4b12ba9efabb89472fd (diff) | |
parent | 64bc0c69ed6b77283905b04585f03c23cbedbe03 (diff) | |
download | pleroma-84f42b92f0f53c569d0f7628d0a4af3ee5c06eaa.tar.gz pleroma-84f42b92f0f53c569d0f7628d0a4af3ee5c06eaa.zip |
Merge branch 'develop' into 'fix/prune-hashtags'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'mix.exs')
-rw-r--r-- | mix.exs | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -137,8 +137,7 @@ defmodule Pleroma.Mixfile do {:tesla, "~> 1.4.0", override: true}, {:castore, "~> 0.1"}, {:cowlib, "~> 2.9", override: true}, - {:gun, - github: "ninenines/gun", ref: "921c47146b2d9567eac7e9a4d2ccc60fffd4f327", override: true}, + {:gun, "~> 2.0.0-rc.1", override: true}, {:jason, "~> 1.2"}, {:mogrify, "~> 0.7.4"}, {:ex_aws, "~> 2.1.6"}, @@ -150,7 +149,8 @@ defmodule Pleroma.Mixfile do git: "https://git.pleroma.social/pleroma/elixir-libraries/crypt.git", ref: "cf2aa3f11632e8b0634810a15b3e612c7526f6a3"}, {:cors_plug, "~> 2.0"}, - {:web_push_encryption, "~> 0.3"}, + {:web_push_encryption, + git: "https://github.com/lanodan/elixir-web-push-encryption.git", branch: "bugfix/otp-24"}, {:swoosh, "~> 1.0"}, {:phoenix_swoosh, "~> 0.3"}, {:gen_smtp, "~> 0.13"}, @@ -178,7 +178,7 @@ defmodule Pleroma.Mixfile do {:quack, "~> 0.1.1"}, {:joken, "~> 2.0"}, {:benchee, "~> 1.0"}, - {:pot, "~> 0.11"}, + {:pot, "~> 1.0"}, {:esshd, "~> 0.1.0", runtime: Application.get_env(:esshd, :enabled, false)}, {:ex_const, "~> 0.2"}, {:plug_static_index_html, "~> 1.0.0"}, @@ -196,6 +196,9 @@ defmodule Pleroma.Mixfile do {:majic, git: "https://git.pleroma.social/pleroma/elixir-libraries/majic.git", ref: "289cda1b6d0d70ccb2ba508a2b0bd24638db2880"}, + {:eblurhash, + git: "https://github.com/zotonic/eblurhash.git", + ref: "04a0b76eadf4de1be17726f39b6313b88708fd12"}, {:open_api_spex, "~> 3.10"}, ## dev & test @@ -205,10 +208,7 @@ defmodule Pleroma.Mixfile do {:mock, "~> 0.3.5", only: :test}, # temporary downgrade for excoveralls, hackney until hackney max_connections bug will be fixed {:excoveralls, "0.12.3", only: :test}, - {:hackney, - git: "https://git.pleroma.social/pleroma/elixir-libraries/hackney.git", - ref: "7d7119f0651515d6d7669c78393fd90950a3ec6e", - override: true}, + {:hackney, "~> 1.17.0", override: true}, {:mox, "~> 1.0", only: :test}, {:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test} ] ++ oauth_deps() |