Skip to content
Permalink
Browse files

Update to elixir 1.9

  • Loading branch information...
ConnorRigby committed Jul 12, 2019
1 parent 0bba383 commit 9efdb15c724344cd76a3f6330ee3a61e95b2cf3e
@@ -8,7 +8,7 @@ install_elixir: &install_elixir
run:
name: Install Elixir
command: |
wget https://github.com/elixir-lang/elixir/releases/download/v1.8.1/Precompiled.zip
wget https://github.com/elixir-lang/elixir/releases/download/v1.9.0/Precompiled.zip
unzip -d /usr/local/elixir Precompiled.zip
echo 'export PATH=/usr/local/elixir/bin:$PATH' >> $BASH_ENV
@@ -1,2 +1,2 @@
erlang 21.3.7
elixir 1.8.1-otp-21
erlang 22.0.7
elixir 1.9.0-otp-22
@@ -1 +1 @@
~> 1.8
~> 1.9
@@ -32,7 +32,9 @@ defmodule FarmbotCeleryScript.MixProject do
]
end

def elixirc_paths(:test), do: ["lib", "./test/support", "../test/support/celery_script"]
def elixirc_paths(:test),
do: ["lib", Path.expand("./test/support"), Path.expand("../test/support/celery_script")]

def elixirc_paths(_), do: ["lib"]

# Run "mix help compile.app" to learn about applications.
@@ -69,11 +69,11 @@ defmodule FarmbotCore.MixProject do
end

defp elixirc_paths(:test) do
["lib", "../test/support"]
["lib", Path.expand("../test/support")]
end

defp elixirc_paths(:dev) do
["lib", "../test/support"]
["lib", Path.expand("../test/support")]
end

defp elixirc_paths(_), do: ["lib"]
@@ -10,7 +10,7 @@
"dialyxir": {:hex, :dialyxir, "1.0.0-rc.3", "774306f84973fc3f1e2e8743eeaa5f5d29b117f3916e5de74c075c02f1b8ef55", [:mix], [], "hexpm"},
"earmark": {:hex, :earmark, "1.2.6", "b6da42b3831458d3ecc57314dff3051b080b9b2be88c2e5aa41cd642a5b044ed", [:mix], [], "hexpm"},
"ecto": {:hex, :ecto, "2.2.9", "031d55df9bb430cb118e6f3026a87408d9ce9638737bda3871e5d727a3594aae", [:mix], [{:db_connection, "~> 1.1", [hex: :db_connection, repo: "hexpm", optional: true]}, {:decimal, "~> 1.2", [hex: :decimal, repo: "hexpm", optional: false]}, {:mariaex, "~> 0.8.0", [hex: :mariaex, repo: "hexpm", optional: true]}, {:poison, "~> 2.2 or ~> 3.0", [hex: :poison, repo: "hexpm", optional: true]}, {:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.13.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:sbroker, "~> 1.0", [hex: :sbroker, repo: "hexpm", optional: true]}], "hexpm"},
"elixir_make": {:hex, :elixir_make, "0.5.2", "96a28c79f5b8d34879cd95ebc04d2a0d678cfbbd3e74c43cb63a76adf0ee8054", [:mix], [], "hexpm"},
"elixir_make": {:hex, :elixir_make, "0.6.0", "38349f3e29aff4864352084fc736fa7fa0f2995a819a737554f7ebd28b85aaab", [:mix], [], "hexpm"},
"esqlite": {:hex, :esqlite, "0.2.4", "3a8a352c190afe2d6b828b252a6fbff65b5cc1124647f38b15bdab3bf6fd4b3e", [:rebar3], [], "hexpm"},
"ex_doc": {:hex, :ex_doc, "0.19.1", "519bb9c19526ca51d326c060cb1778d4a9056b190086a8c6c115828eaccea6cf", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.7", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"},
"excoveralls": {:hex, :excoveralls, "0.10.1", "407d50ac8fc63dfee9175ccb4548e6c5512b5052afa63eedb9cd452a32a91495", [:mix], [{:hackney, "~> 1.13", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm"},
@@ -18,8 +18,9 @@ defmodule FarmbotOS.MixProject do
version: @version,
branch: @branch,
commit: @commit,
releases: [{:farmbot, release()}],
elixirc_options: [warnings_as_errors: true, ignore_module_conflict: true],
archives: [nerves_bootstrap: "~> 1.4"],
archives: [nerves_bootstrap: "~> 1.6"],
start_permanent: Mix.env() == :prod,
build_embedded: false,
compilers: [:elixir_make | Mix.compilers()],
@@ -28,6 +29,7 @@ defmodule FarmbotOS.MixProject do
deps_path: "deps/#{Mix.target()}",
build_path: "_build/#{Mix.target()}",
test_coverage: [tool: ExCoveralls],
preferred_cli_target: [run: :host, test: :host],
preferred_cli_env: [
coveralls: :test,
"coveralls.detail": :test,
@@ -38,6 +40,15 @@ defmodule FarmbotOS.MixProject do
]
end

def release do
[
overwrite: true,
cookie: "democookie",
include_erts: &Nerves.Release.erts/0,
steps: [&Nerves.Release.init/1, :assemble]
]
end

# Starting nerves_bootstrap adds the required aliases to Mix.Project.config()
# Aliases are only added if MIX_TARGET is set.
def bootstrap(args) do
@@ -66,9 +77,9 @@ defmodule FarmbotOS.MixProject do
{:phoenix_html, "~> 2.13"},

# Nerves stuff.
{:nerves, "~> 1.4", runtime: false},
{:nerves, "~> 1.5", runtime: false},
{:nerves_hub_cli, "~> 0.7", runtime: false},
{:shoehorn, "~> 0.5"},
{:shoehorn, "~> 0.6"},
{:ring_logger, "~> 0.8"},

# Host/test only dependencies.
@@ -78,7 +89,7 @@ defmodule FarmbotOS.MixProject do
{:elixir_make, "~> 0.5", runtime: false},

# Target only deps
{:nerves_runtime, "~> 0.9", targets: @all_targets},
{:nerves_runtime, "~> 0.10", targets: @all_targets},
{:nerves_time, "~> 0.2", targets: @all_targets},
{:nerves_hub, "~> 0.7", targets: @all_targets},
{:mdns, "~> 1.0", targets: @all_targets},
@@ -89,9 +100,9 @@ defmodule FarmbotOS.MixProject do
{:vintage_net,
github: "nerves-networking/vintage_net", tag: "dhcp-properties", targets: @all_targets},
{:busybox, "~> 0.1.2", targets: @all_targets},
{:farmbot_system_rpi3, "1.7.2-farmbot.2", runtime: false, targets: :rpi3},
{:farmbot_system_rpi0, "1.7.2-farmbot.2", runtime: false, targets: :rpi0},
{:farmbot_system_rpi, "1.7.2-farmbot.3", runtime: false, targets: :rpi}
{:farmbot_system_rpi3, "1.8.0-farmbot.1", runtime: false, targets: :rpi3},
{:farmbot_system_rpi0, "1.8.0-farmbot.0", runtime: false, targets: :rpi0},
{:farmbot_system_rpi, "1.8.0-farmbot.0", runtime: false, targets: :rpi}
]
end

0 comments on commit 9efdb15

Please sign in to comment.
You can’t perform that action at this time.