Skip to content

Commit

Permalink
Update sparrow dependency
Browse files Browse the repository at this point in the history
* Update ref
* Add config entry for Sparrow required options
  • Loading branch information
kmakiela committed Sep 25, 2019
1 parent 5925e75 commit edb0edf
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 2 additions & 0 deletions config/config.exs
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ config :lager,
]
]

config :sparrow, Sparrow.PoolsWarden, %{enabled: true}

import_config "#{Mix.env()}.exs"

# Globally disable maru's "test mode". If we don't disable it explicitly
Expand Down
7 changes: 3 additions & 4 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ defmodule MongoosePush.Mixfile do
defp deps do
[
{:chatterbox, github: "joedevivo/chatterbox", ref: "ff0c2e0", override: true},
{:sparrow, github: "esl/sparrow", ref: "b41ea2c"},
{:sparrow, github: "esl/sparrow", ref: "358a816b913362daa99f126ceb35b172aa511044"},
{:maru, github: "rslota/maru", ref: "54fc038", override: true},
{:cowboy, "~> 2.3", override: true},
{:jason, "~> 1.0"},
Expand Down Expand Up @@ -98,11 +98,10 @@ defmodule MongoosePush.Mixfile do
[test: "test --no-start"]
end

# Exclude lib/mix/tasks/certs_dev.ex as it's conflictng with the same module in Sparrow.
# Also, all mix tasks are redundant in runtime, but we still need to compile `lib/mix/tasks/compile_asn1.ex`
# All mix tasks are redundant in runtime, but we still need to compile `lib/mix/tasks/compile_asn1.ex`
# as it's required by build process (ASN1 compiler).
defp elixirc_paths(:prod),
do: ["lib/mix/tasks/compile_asn1.ex", "lib/mongoose_push", "lib/mongoose_push.ex"]
do: ["lib"]

defp elixirc_paths(_), do: ["lib"]
end
2 changes: 1 addition & 1 deletion mix.lock
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"poolboy": {:hex, :poolboy, "1.5.1", "6b46163901cfd0a1b43d692657ed9d7e599853b3b21b95ae5ae0a777cf9b6ca8", [:rebar], [], "hexpm"},
"quixir": {:hex, :quixir, "0.9.3", "f01c37386b9e1d0526f01a8734a6d7884af294a0ec360f05c24c7171d74632bd", [:mix], [{:pollution, "~> 0.9.2", [hex: :pollution, repo: "hexpm", optional: false]}], "hexpm"},
"ranch": {:hex, :ranch, "1.4.0", "10272f95da79340fa7e8774ba7930b901713d272905d0012b06ca6d994f8826b", [:rebar3], [], "hexpm"},
"sparrow": {:git, "https://github.com/esl/sparrow.git", "b41ea2cc9e6c97ff5db784cb49402ec87234295d", [ref: "b41ea2c"]},
"sparrow": {:git, "https://github.com/esl/sparrow.git", "358a816b913362daa99f126ceb35b172aa511044", [ref: "358a816b913362daa99f126ceb35b172aa511044"]},
"ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.1", "28a4d65b7f59893bc2c7de786dec1e1555bd742d336043fe644ae956c3497fbe", [:make, :rebar], [], "hexpm"},
"unicode_util_compat": {:hex, :unicode_util_compat, "0.3.1", "a1f612a7b512638634a603c8f401892afbf99b8ce93a45041f8aaca99cadb85e", [:rebar3], [], "hexpm"},
"uuid": {:hex, :uuid, "1.1.8", "e22fc04499de0de3ed1116b770c7737779f226ceefa0badb3592e64d5cfb4eb9", [:mix], [], "hexpm"},
Expand Down

0 comments on commit edb0edf

Please sign in to comment.