Skip to content

Commit

Permalink
Bump version with Plug dep fix
Browse files Browse the repository at this point in the history
  • Loading branch information
chrismccord committed Dec 10, 2014
1 parent 8e1bfba commit 7638d23
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## v0.7.1 (2014-12-09)

* Bug fixes
* Include Plug dep in new project generation since it's a github dep until next Plug release.

## v0.7.0 (2014-12-09)
See these [`0.6.x` to `0.7.0` upgrade instructions](https://gist.github.com/chrismccord/c24b2b516066d987f4fe) to bring your existing apps up to speed.

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

1. Install Phoenix

git clone https://github.com/phoenixframework/phoenix.git && cd phoenix && git checkout v0.7.0 && mix do deps.get, compile
git clone https://github.com/phoenixframework/phoenix.git && cd phoenix && git checkout v0.7.1 && mix do deps.get, compile


2. Create a new Phoenix application
Expand Down
6 changes: 3 additions & 3 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ defmodule Phoenix.Mixfile do

def project do
[app: :phoenix,
version: "0.7.0",
version: "0.7.1",
elixir: "~> 1.0.2 or ~> 1.1-dev",
deps: deps,
package: package,
Expand Down Expand Up @@ -37,13 +37,13 @@ defmodule Phoenix.Mixfile do
{:inch_ex, "~> 0.2", only: :docs},
{:websocket_client, github: "jeremyong/websocket_client", only: :test}]
end

defp package do
[contributors: ["Chris McCord", "Darko Fabijan", "José Valim"],
licenses: ["MIT"],
links: %{github: "https://github.com/phoenixframework/phoenix"}]
end

defp docs do
{ref, 0} = System.cmd("git", ["rev-parse", "--verify", "--quiet", "HEAD"])
[source_ref: ref,
Expand Down
3 changes: 2 additions & 1 deletion priv/template/mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ defmodule <%= application_module %>.Mixfile do
#
# Type `mix help deps` for examples and options
defp deps do
[{:phoenix, "~> 0.7.0"},
[{:plug, github: "elixir-lang/plug", ref: "7040c89cb4cf1f1c6afdee379e5982a07d77a6c3"},
{:phoenix, "~> 0.7.1"},
{:cowboy, "~> 1.0"}]
end
end

0 comments on commit 7638d23

Please sign in to comment.