From 28df63140b2a3d42941c0875de89a8e27d0559e4 Mon Sep 17 00:00:00 2001 From: Henry Popp Date: Wed, 31 Jan 2018 14:39:11 -0600 Subject: [PATCH] fix: relax httpoison dependency to 0.x or 1.0 (#108) * fix: relax httpoison dependency to 0.x or 1.0 Closes #107 Also: - Added elixir 1.6 to travis config - Removed outdated `use_2197: true` from APNS docs * chore: bump pigeon to v1.1.5 --- .travis.yml | 1 + CHANGELOG.md | 3 +++ docs/APNS Apple iOS.md | 1 - docs/Getting Started.md | 2 +- mix.exs | 25 ++++++++++++------------- mix.lock | 10 ++++++---- 6 files changed, 23 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 74adc38b..ceb9af78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: elixir elixir: - 1.4.5 - 1.5.3 + - 1.6.0 otp_release: - 19.2 - 20.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ca10eef..5c933f8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## v1.1.5 +* Fix: relax httpoison dependency to allow 0.x or 1.0 + ## v1.1.4 * Fix: `:on_response` callbacks spawned as supervised task instead of running in the `Worker` process diff --git a/docs/APNS Apple iOS.md b/docs/APNS Apple iOS.md index 192fe26d..b28188d7 100644 --- a/docs/APNS Apple iOS.md +++ b/docs/APNS Apple iOS.md @@ -10,7 +10,6 @@ cert: "cert.pem", key: "key_unencrypted.pem", mode: :dev - use_2197: true (optional) } ``` diff --git a/docs/Getting Started.md b/docs/Getting Started.md index 45ccb0de..a3799c4e 100644 --- a/docs/Getting Started.md +++ b/docs/Getting Started.md @@ -12,7 +12,7 @@ Add pigeon and kadabra as `mix.exs` dependencies: ```elixir def deps do [ - {:pigeon, "~> 1.1.4"}, + {:pigeon, "~> 1.1.5"}, {:kadabra, "~> 0.3.6"} ] end diff --git a/mix.exs b/mix.exs index 9bacc90a..5e4e6428 100644 --- a/mix.exs +++ b/mix.exs @@ -1,7 +1,7 @@ defmodule Pigeon.Mixfile do use Mix.Project - @version "1.1.4" + @version "1.1.5" def project do [ @@ -9,15 +9,15 @@ defmodule Pigeon.Mixfile do name: "Pigeon", version: @version, elixir: "~> 1.4", - elixirc_paths: elixirc_paths(Mix.env), + elixirc_paths: elixirc_paths(Mix.env()), source_url: "https://github.com/codedge-llc/pigeon", description: description(), package: package(), - build_embedded: Mix.env == :prod, - start_permanent: Mix.env == :prod, + build_embedded: Mix.env() == :prod, + start_permanent: Mix.env() == :prod, test_coverage: [tool: ExCoveralls], preferred_cli_env: [ - "coveralls": :test, + coveralls: :test, "coveralls.detail": :test, "coveralls.post": :test, "coveralls.html": :test @@ -42,17 +42,16 @@ defmodule Pigeon.Mixfile do end defp elixirc_paths(:test), do: ["lib", "test/support"] - defp elixirc_paths(_), do: ["lib"] + defp elixirc_paths(_), do: ["lib"] def application do - [extra_applications: [:logger], - mod: {Pigeon, []}] + [extra_applications: [:logger], mod: {Pigeon, []}] end defp deps do [ {:poison, "~> 2.0 or ~> 3.0"}, - {:httpoison, "~> 0.7"}, + {:httpoison, "~> 0.7 or ~> 1.0"}, {:gen_stage, "~> 0.12.0"}, {:kadabra, "~> 0.3.6", optional: true}, {:earmark, "~> 1.0", only: :dev}, @@ -72,10 +71,10 @@ defmodule Pigeon.Mixfile do defp package do [ - files: ["lib", "mix.exs", "README*", "LICENSE*"], - maintainers: ["Henry Popp", "Tyler Hurst"], - licenses: ["MIT"], - links: %{"GitHub" => "https://github.com/codedge-llc/pigeon"} + files: ["lib", "mix.exs", "README*", "LICENSE*"], + maintainers: ["Henry Popp", "Tyler Hurst"], + licenses: ["MIT"], + links: %{"GitHub" => "https://github.com/codedge-llc/pigeon"} ] end end diff --git a/mix.lock b/mix.lock index f4cc1b93..74e529a7 100644 --- a/mix.lock +++ b/mix.lock @@ -1,4 +1,5 @@ -%{"bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [], [], "hexpm"}, +%{ + "bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [], [], "hexpm"}, "certifi": {:hex, :certifi, "2.0.0", "a0c0e475107135f76b8c1d5bc7efb33cd3815cb3cf3dea7aefdd174dabead064", [:rebar3], []}, "credo": {:hex, :credo, "0.8.10", "261862bb7363247762e1063713bb85df2bbd84af8d8610d1272cd9c1943bba63", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}], "hexpm"}, "dialyxir": {:hex, :dialyxir, "0.5.1", "b331b091720fd93e878137add264bac4f644e1ddae07a70bf7062c7862c4b952", [:mix], []}, @@ -8,9 +9,9 @@ "excoveralls": {:hex, :excoveralls, "0.8.0", "99d2691d3edf8612f128be3f9869c4d44b91c67cec92186ce49470ae7a7404cf", [:mix], [{:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:hackney, ">= 0.12.0", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm"}, "exjsx": {:hex, :exjsx, "4.0.0", "60548841e0212df401e38e63c0078ec57b33e7ea49b032c796ccad8cde794b5c", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, optional: false]}]}, "gen_stage": {:hex, :gen_stage, "0.12.2", "e0e347cbb1ceb5f4e68a526aec4d64b54ad721f0a8b30aa9d28e0ad749419cbb", [], [], "hexpm"}, - "hackney": {:hex, :hackney, "1.10.1", "c38d0ca52ea80254936a32c45bb7eb414e7a96a521b4ce76d00a69753b157f21", [:rebar3], [{:certifi, "2.0.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "5.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm"}, + "hackney": {:hex, :hackney, "1.11.0", "4951ee019df102492dabba66a09e305f61919a8a183a7860236c0fde586134b6", [:rebar3], [{:certifi, "2.0.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "5.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm"}, "hpack": {:hex, :hpack_erl, "0.2.3", "17670f83ff984ae6cd74b1c456edde906d27ff013740ee4d9efaa4f1bf999633", [:rebar3], []}, - "httpoison": {:hex, :httpoison, "0.13.0", "bfaf44d9f133a6599886720f3937a7699466d23bb0cd7a88b6ba011f53c6f562", [:mix], [{:hackney, "~> 1.8", [hex: :hackney, optional: false]}]}, + "httpoison": {:hex, :httpoison, "1.0.0", "1f02f827148d945d40b24f0b0a89afe40bfe037171a6cf70f2486976d86921cd", [:mix], [{:hackney, "~> 1.8", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm"}, "idna": {:hex, :idna, "5.1.0", "d72b4effeb324ad5da3cab1767cb16b17939004e789d8c0ad5b70f3cea20c89a", [:rebar3], [{:unicode_util_compat, "0.3.1", [hex: :unicode_util_compat, optional: false]}]}, "jsx": {:hex, :jsx, "2.8.3", "a05252d381885240744d955fbe3cf810504eb2567164824e19303ea59eef62cf", [:mix, :rebar3], [], "hexpm"}, "kadabra": {:hex, :kadabra, "0.3.6", "22deab8b2a7b7aa65692a5b3fc566229b32c6036095bf423ebbeb999df987669", [:mix], [{:hpack, "~> 0.2.3", [hex: :hpack_erl, repo: "hexpm", optional: false]}, {:scribe, "~> 0.4", [hex: :scribe, repo: "hexpm", optional: true]}], "hexpm"}, @@ -20,4 +21,5 @@ "poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], []}, "scribe": {:hex, :scribe, "0.5.0", "1fe6dfffc4264a39633c1bd3fc9ce8377546974c40c7cd2a06194b2c2e91bba0", [], [{:pane, "~> 0.1", [hex: :pane, repo: "hexpm", optional: false]}], "hexpm"}, "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.1", "28a4d65b7f59893bc2c7de786dec1e1555bd742d336043fe644ae956c3497fbe", [:make, :rebar], []}, - "unicode_util_compat": {:hex, :unicode_util_compat, "0.3.1", "a1f612a7b512638634a603c8f401892afbf99b8ce93a45041f8aaca99cadb85e", [:rebar3], []}} + "unicode_util_compat": {:hex, :unicode_util_compat, "0.3.1", "a1f612a7b512638634a603c8f401892afbf99b8ce93a45041f8aaca99cadb85e", [:rebar3], []}, +}