Skip to content

Commit

Permalink
Merge pull request #60 from lowks/elixir_1_5_0
Browse files Browse the repository at this point in the history
Elixir 1 5 0
  • Loading branch information
lowks committed Aug 2, 2017
2 parents 34d63a8 + 40ed070 commit 6bd4912
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: elixir
env:
- MIX_ENV=test
elixir:
- 1.4.2
- 1.5.0
otp_release:
- 17.5
- 18.0
Expand Down
4 changes: 3 additions & 1 deletion lib/radpath.ex
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ defmodule Radpath do
use Radpath.Dirs
use Radpath.Files
use Radpath.Tempfs
use Supervisor

def start(_type, _args) do
Radpath.Supervisor.start_link
# Radpath.Supervisor.start_link(__MODULE__, _args)
Supervisor.start_link(__MODULE__, _args)
end

defmacro __using__([]) do
Expand Down
4 changes: 2 additions & 2 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ defmodule Radpath.Mixfile do
def project do
[ app: :radpath,
version: @version,
elixir: "~> 1.4.0 or ~> 1.3.0 or ~> 1.0.2 or ~> 1.1.0",
elixir: "~> 1.5.0 or ~> 1.4.0 or ~> 1.3.0 or ~> 1.0.2 or ~> 1.1.0",
description: description,
docs: [source_ref: "v#{@version}", main: "Radpath"],
package: package,
Expand Down Expand Up @@ -60,7 +60,7 @@ defmodule Radpath.Mixfile do

defp deps(:test) do
deps(:prod) ++ [
{:amrita, "~>0.4", github: "josephwilk/amrita", only: :test},
# {:amrita, "~>0.4", github: "josephwilk/amrita", only: :test},
{:excoveralls, "== 0.3.6", only: :test},
]
end
Expand Down
2 changes: 1 addition & 1 deletion script/circleci/prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

export ERLANG_VERSION="18.0"
export ELIXIR_VERSION="v1.3.4"
export ELIXIR_VERSION="v1.5.0"
export INSTALL_PATH="$HOME/dependencies"

export ERLANG_PATH="$INSTALL_PATH/otp_src_$ERLANG_VERSION"
Expand Down
2 changes: 1 addition & 1 deletion test/test_helper.exs
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ defmodule PathHelpers do
Path.expand("fixtures", __DIR__)
end
end
# ExUnit.start
ExUnit.start
# Amrita.start(formatters: [Amrita.Formatter.Documentation])

0 comments on commit 6bd4912

Please sign in to comment.