Skip to content

Commit

Permalink
Release v0.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ericmj committed Jun 18, 2014
1 parent ecb4002 commit 70f43d6
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 15 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# v0.2.1-dev
# v0.2.1 (2014-06-18)

* Enhancements
* Add support for all query expressions in `order_by`, `group_by` and `distinct` expressions, instead of only allowing lists of fields
Expand Down
25 changes: 13 additions & 12 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ defmodule Ecto.Mixfile do

def project do
[app: :ecto,
version: "0.2.1-dev",
elixir: "== 0.13.3 or ~> 0.14.0-dev",
version: "0.2.1",
elixir: "== 0.13.3 or ~> 0.14.0",
deps: deps,
build_per_environment: false,
test_paths: test_paths(Mix.env),
Expand All @@ -23,12 +23,13 @@ defmodule Ecto.Mixfile do
end

defp deps do
[ { :poolboy, "~> 1.2.1" },
{ :decimal, github: "ericmj/decimal", optional: true },
{ :postgrex, github: "ericmj/postgrex", optional: true },
# { :decimal, "~> 0.2.1", optional: true },
# { :postgrex, "~> 0.5.1", optional: true },
{ :ex_doc, github: "elixir-lang/ex_doc", only: :dev } ]
[{:poolboy, "~> 1.2.1"},
# {:decimal, github: "ericmj/decimal", optional: true},
# {:postgrex, github: "ericmj/postgrex", optional: true},
{:decimal, "~> 0.2.1", optional: true},
{:postgrex, "~> 0.5.1", optional: true},
{:ex_doc, github: "elixir-lang/ex_doc", only: :dev},
{:markdown, github: "devinus/markdown", only: :dev}]
end

defp test_paths(:pg), do: ["integration_test/pg"]
Expand All @@ -42,10 +43,10 @@ defmodule Ecto.Mixfile do
end

defp package do
[ contributors: ["Eric Meadows-Jönsson", "José Valim"],
licenses: ["Apache 2.0"],
links: %{"GitHub" => "https://github.com/elixir-lang/ecto",
"Docs" => "http://elixir-lang.org/docs/ecto/"} ]
[contributors: ["Eric Meadows-Jönsson", "José Valim"],
licenses: ["Apache 2.0"],
links: %{"GitHub" => "https://github.com/elixir-lang/ecto",
"Docs" => "http://elixir-lang.org/docs/ecto/"}]
end

defp docs do
Expand Down
6 changes: 4 additions & 2 deletions mix.lock
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
%{"decimal": {:git, "git://github.com/ericmj/decimal.git", "34e6959c24e200a5a90d18a9b2bbcdf998c69d4b", []},
%{"decimal": {:package, "0.2.2"},
"ex_doc": {:git, "git://github.com/elixir-lang/ex_doc.git", "ca476cd10556b079a7b2ab421c9fdf3425afbe8a", []},
"hoedown": {:git, "git://github.com/hoedown/hoedown.git", "0610117f44b173a4e2112afb2f510156a32355b5", []},
"markdown": {:git, "git://github.com/devinus/markdown.git", "0345e2044ba71780ba02b2591f1017703d0fa148", []},
"poolboy": {:package, "1.2.1"},
"postgrex": {:git, "git://github.com/ericmj/postgrex.git", "dc15ecfb0eb1b8c74bae1b008dddca97a40ab213", []}}
"postgrex": {:package, "0.5.2"}}

0 comments on commit 70f43d6

Please sign in to comment.