Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update dependencies(patch) #80

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update dependencies(patch) #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/config.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
use Mix.Config
import Config
import_config "#{Mix.env()}.exs"
2 changes: 1 addition & 1 deletion config/dev.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
use Mix.Config
import Config
2 changes: 1 addition & 1 deletion config/prod.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
use Mix.Config
import Config
2 changes: 1 addition & 1 deletion config/test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
use Mix.Config
import Config
config :cloudex, api_key: "my_key", secret: "my_secret", cloud_name: "my_cloud_name"
2 changes: 1 addition & 1 deletion lib/cloudex/cloudinary_api.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ defmodule Cloudex.CloudinaryApi do
{"Accept", "application/json"}
]

@json_library Application.get_env(:cloudex, :json_library, Jason)
@json_library Application.compile_env(:cloudex, :json_library, Jason)

@doc """
Upload either a file or url to cloudinary
Expand Down
20 changes: 10 additions & 10 deletions mix.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ defmodule Cloudex.Mixfile do
def project do
[
app: :cloudex,
version: "1.4.1",
version: "1.4.2",
description: """
A library that helps with uploading image files and urls to cloudinary.
Also provides a helper to generate transformations and cloudinary urls pointing to your images
""",
package: package(),
elixir: "~> 1.7",
elixir: "~> 1.17.1",
build_embedded: Mix.env() == :prod,
start_permanent: Mix.env() == :prod,
deps: deps(),
Expand Down Expand Up @@ -49,17 +49,17 @@ defmodule Cloudex.Mixfile do

defp deps do
[
{:credo, "> 0.0.0", only: :dev, runtime: false},
{:dialyxir, "~> 1.0.0-rc.3", only: [:dev], runtime: false},
{:credo, "~> 1.7", only: :dev, runtime: false},
{:dialyxir, "~> 1.4", only: [:dev], runtime: false},
{:earmark, "> 0.0.0", only: :dev},
{:ex_doc, "> 0.0.0", only: :dev},
{:excoveralls, "> 0.0.0", only: :test},
{:exvcr, "~> 0.10", [only: :test]},
{:httpoison, "~> 1.6"},
{:mix_test_watch, "> 0.0.0", only: :dev},
{:jason, "~> 1.0", optional: true},
{:timex, "~> 3.6"},
{:tzdata, "~> 1.0"}
{:exvcr, "~> 0.11", [only: :test]},
{:httpoison, "~> 2.0"},
{:mix_test_watch, "~> 1.0", only: :dev},
{:jason, "~> 1.4", optional: true},
{:timex, "~> 3.7.11"},
{:tzdata, "~> 1.1"}
]
end

Expand Down
55 changes: 29 additions & 26 deletions mix.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/cloudex/cloudex_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ defmodule CloudexTest do
use ExUnit.Case, async: false
use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney

@json_library Application.get_env(:cloudex, :json_library, Jason)
@json_library Application.compile_env(:cloudex, :json_library, Jason)

setup_all do
ExVCR.Config.cassette_library_dir("test/assets/vcr_cassettes")
Expand Down