Permalink
Browse files

Release v1.2.6

  • Loading branch information...
josevalim committed Jun 6, 2016
1 parent a77b856 commit 3dbfb92860fb24f83c92e1f1b67f48554fb211d6
@@ -85,7 +85,7 @@ ask Mix to use Rebar 3 to compile it by passing the `manager: :rebar3` option.
Once configured, Mix will prompt you to install Rebar 3 if it is not yet
available.
## v1.2.6-dev
## v1.2.6 (2016-06-06)
### 1. Enhancements
@@ -1 +1 @@
1.2.6-dev
1.2.6
@@ -220,8 +220,12 @@ defmodule Mix.Compilers.Elixir do
## Manifest handling

defp read_manifest(manifest) do
case :file.consult(manifest) do
{:ok, [@manifest_vsn|t]} -> t
try do
case :file.consult(manifest) do
{:ok, [@manifest_vsn|t]} -> t
_ -> []
end
rescue
_ -> []
end
end
@@ -17,13 +17,17 @@ defmodule Mix.Dep.ElixirSCM do
end

def read(manifest_path \\ Mix.Project.manifest_path) do
case :file.consult(manifest(manifest_path)) do
{:ok, [{@manifest_vsn, vsn, scm}]} ->
{:ok, vsn, scm}
{:error, {_, :erl_parse, _}} ->
{:ok, "1.0.0", nil} # Force old version if file exists but old format
_ ->
:error
try do
case :file.consult(manifest(manifest_path)) do
{:ok, [{@manifest_vsn, vsn, scm}]} ->
{:ok, vsn, scm}
{:error, {_, :erl_parse, _}} ->
{:ok, "1.0.0", nil} # Force old version if file exists but old format
_ ->
:error
end
rescue
_ -> :error
end
end
end
@@ -116,8 +116,12 @@ defmodule Mix.Tasks.Compile.Protocols do
end

defp read_manifest(manifest) do
case :file.consult(manifest) do
{:ok, [@manifest_vsn|t]} -> t
try do
case :file.consult(manifest) do
{:ok, [@manifest_vsn|t]} -> t
_ -> []
end
rescue
_ -> []
end
end
@@ -1,6 +1,6 @@
{application, elixir,
[{description, "elixir"},
{vsn, "1.2.6-dev"},
{vsn, "1.2.6"},
{modules, [
elixir
]},

0 comments on commit 3dbfb92

Please sign in to comment.