X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=mix.exs;h=bd9bce7665c7b99fce4adf9cb98d109f1011bb47;hb=3d492795b76cfe3b3616607f815a0effe44c1ce5;hp=865ead43b1ad5eae7ef075e698d229ac92c86269;hpb=675653ceb78e4a64d8375904e555cdd62f064e21;p=akkoma diff --git a/mix.exs b/mix.exs index 865ead43b..bd9bce766 100644 --- a/mix.exs +++ b/mix.exs @@ -56,6 +56,7 @@ defmodule Pleroma.Mixfile do {:calendar, "~> 0.17.4"}, {:cachex, "~> 3.0.2"}, {:httpoison, "~> 1.2.0"}, + {:tesla, "~> 1.2"}, {:jason, "~> 1.0"}, {:mogrify, "~> 0.6.1"}, {:ex_aws, "~> 2.0"}, @@ -67,7 +68,8 @@ defmodule Pleroma.Mixfile do {:crypt, git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"}, {:cors_plug, "~> 1.5"}, - {:ex_doc, "> 0.18.3 and < 0.20.0", only: :dev, runtime: false} + {:ex_doc, "> 0.18.3 and < 0.20.0", only: :dev, runtime: false}, + {:web_push_encryption, "~> 0.2.1"} ] end @@ -95,7 +97,7 @@ defmodule Pleroma.Mixfile do {git_tag, git_pre_release} = with {tag, 0} <- System.cmd("git", ["describe", "--tags", "--abbrev=0"]), tag = String.trim(tag), - {describe, 0} <- System.cmd("git", ["describe", "--tags"]), + {describe, 0} <- System.cmd("git", ["describe", "--tags", "--abbrev=8"]), describe = String.trim(describe), ahead <- String.replace(describe, tag, "") do {String.replace_prefix(tag, "v", ""), if(ahead != "", do: String.trim(ahead))}