Merge branch 'remove-swift' into 'develop'

Remove Uploaders.Swift and `httpoison` dependency

Closes #1051

See merge request pleroma/pleroma!1374

diff --combined mix.exs
index 48a43fccb44e4c11c73a62d2db95c9bb10aea5f1,518de590dfb8df999929aaff545713ce74360549..8f64562ef947700b1d2407efc5845aa10dd458c7
--- 1/mix.exs
--- 2/mix.exs
+++ b/mix.exs
@@@ -109,7 -109,6 +109,6 @@@ defmodule Pleroma.Mixfile d
        {:phoenix_html, "~> 2.10"},
        {:calendar, "~> 0.17.4"},
        {:cachex, "~> 3.0.2"},
-       {:httpoison, "~> 1.2.0"},
        {:poison, "~> 3.0", override: true},
        {:tesla, "~> 1.2"},
        {:jason, "~> 1.0"},
@@@ -151,8 -150,7 +150,8 @@@
        {:esshd, "~> 0.1.0", runtime: Application.get_env(:esshd, :enabled, false)},
        {:ex_rated, "~> 1.3"},
        {:plug_static_index_html, "~> 1.0.0"},
 -      {:excoveralls, "~> 0.11.1", only: :test}
 +      {:excoveralls, "~> 0.11.1", only: :test},
 +      {:mox, "~> 0.5", only: :test}
      ] ++ oauth_deps()
    end
  
@@@ -175,14 -173,10 +174,14 @@@
    # Builds a version string made of:
    # * the application version
    # * a pre-release if ahead of the tag: the describe string (-count-commithash)
 -  # * build info:
 +  # * branch name
 +  # * build metadata:
    #   * a build name if `PLEROMA_BUILD_NAME` or `:pleroma, :build_name` is defined
    #   * the mix environment if different than prod
    defp version(version) do
 +    identifier_filter = ~r/[^0-9a-z\-]+/i
 +
 +    # Pre-release version, denoted from patch version with a hyphen
      {git_tag, git_pre_release} =
        with {tag, 0} <-
               System.cmd("git", ["describe", "--tags", "--abbrev=0"], stderr_to_stdout: true),
@@@ -203,19 -197,6 +202,19 @@@
        )
      end
  
 +    # Branch name as pre-release version component, denoted with a dot
 +    branch_name =
 +      with {branch_name, 0} <- System.cmd("git", ["rev-parse", "--abbrev-ref", "HEAD"]),
 +           branch_name <- System.get_env("PLEROMA_BUILD_BRANCH") || branch_name,
 +           true <- branch_name != "master" do
 +        branch_name =
 +          branch_name
 +          |> String.trim()
 +          |> String.replace(identifier_filter, "-")
 +
 +        "." <> branch_name
 +      end
 +
      build_name =
        cond do
          name = Application.get_env(:pleroma, :build_name) -> name
@@@ -224,26 -205,37 +223,26 @@@
        end
  
      env_name = if Mix.env() != :prod, do: to_string(Mix.env())
 -
      env_override = System.get_env("PLEROMA_BUILD_ENV")
  
      env_name =
 -      if env_override do
 -        if env_override != "prod", do: env_override
 -      else
 -        env_name
 +      case env_override do
 +        nil -> env_name
 +        env_override when env_override in ["", "prod"] -> nil
 +        env_override -> env_override
        end
  
 -    build =
 +    # Build metadata, denoted with a plus sign
 +    build_metadata =
        [build_name, env_name]
        |> Enum.filter(fn string -> string && string != "" end)
 -      |> Enum.join("-")
 +      |> Enum.join(".")
        |> (fn
              "" -> nil
 -            string -> "+" <> string
 +            string -> "+" <> String.replace(string, identifier_filter, "-")
            end).()
  
 -    branch_name =
 -      with {branch_name, 0} <- System.cmd("git", ["rev-parse", "--abbrev-ref", "HEAD"]),
 -           branch_name <- System.get_env("PLEROMA_BUILD_BRANCH") || branch_name,
 -           true <- branch_name != "master" do
 -        branch_name =
 -          String.trim(branch_name)
 -          |> String.replace(~r/[^0-9a-z\-\.]+/i, "-")
 -
 -        "-" <> branch_name
 -      end
 -
 -    [version, git_pre_release, branch_name, build]
 +    [version, git_pre_release, branch_name, build_metadata]
      |> Enum.filter(fn string -> string && string != "" end)
      |> Enum.join()
    end