Skip to content
Permalink
Browse files

Update more deps and clean up config

  • Loading branch information...
ConnorRigby committed Mar 11, 2019
1 parent 11754d8 commit d27cc4f25da9cd8d0d8ca5cb81f90030192a71f3
Showing with 9 additions and 15 deletions.
  1. +0 −2 config/config.exs
  2. +0 −7 config/host/dev.exs
  3. +2 −0 config/target/dev.exs
  4. +2 −0 config/target/prod.exs
  5. +3 −5 mix.exs
  6. +2 −1 mix.lock
@@ -73,8 +73,6 @@ config :nerves, :firmware,
rootfs_overlay: [global_overlay_dir],
provisioning: :nerves_hub

import_config("nerves_hub.exs")

case target do
:host ->
import_config("host/#{env}.exs")
@@ -49,11 +49,4 @@ config :farmbot, :behaviour, [
# firmware_handler: Farmbot.Firmware.UartHandler
]

config :nerves_runtime,
enable_syslog: false,
target: "host",
kernel: [
autoload_modules: false
]

config :farmbot, :uart_handler, tty: "/dev/ttyACM0"
@@ -99,3 +99,5 @@ config :shoehorn,
init: [:nerves_runtime, :nerves_init_gadget, :nerves_firmware_ssh],
handler: Farmbot.ShoehornHandler,
app: :farmbot

import_config("../nerves_hub.exs")
@@ -86,3 +86,5 @@ config :shoehorn,
init: [:nerves_runtime, :nerves_firmware_ssh],
handler: Farmbot.ShoehornHandler,
app: :farmbot

import_config("../nerves_hub.exs")
@@ -62,7 +62,7 @@ defmodule Farmbot.Mixfile do
def application() do
[
mod: {Farmbot, []},
extra_applications: [:logger, :eex, :ssl, :inets, :runtime_tools],
extra_applications: [:logger, :eex, :ssl, :inets, :runtime_tools]
]
end

@@ -96,9 +96,8 @@ defmodule Farmbot.Mixfile do
{:timex, "~> 3.4"},
{:fs, "~> 3.4"},
{:circuits_uart, "~> 1.3"},
{:cowboy, "~> 2.5"},
{:plug, "~> 1.6"},
{:cors_plug, "~> 1.5"},
{:plug_cowboy, "~> 2.0"},
{:cors_plug, "~> 2.0"},
{:amqp, "~> 1.0"},
# AMQP hacks
{:jsx, "~> 2.9", override: true},
@@ -133,7 +132,6 @@ defmodule Farmbot.Mixfile do
{:dhcp_server, "~> 0.7", targets: @all_targets},
{:circuits_gpio, "~> 0.4.0", targets: @all_targets},
{:mdns, "~> 1.0", targets: @all_targets},

{:farmbot_system_rpi3, "1.6.3-farmbot.0", runtime: false, targets: :rpi3},
{:farmbot_system_rpi0, "1.6.3-farmbot.0", runtime: false, targets: :rpi0},
{:farmbot_system_rpi, "1.6.3-farmbot.0", runtime: false, targets: :rpi}
@@ -10,7 +10,7 @@
"circuits_uart": {:hex, :circuits_uart, "1.3.1", "8c0a56f06828133a0b08363ecb994350a9529d388a912357d31829ae617cd801", [:mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"},
"combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm"},
"connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], [], "hexpm"},
"cors_plug": {:hex, :cors_plug, "1.5.2", "72df63c87e4f94112f458ce9d25800900cc88608c1078f0e4faddf20933eda6e", [:mix], [{:plug, "~> 1.3 or ~> 1.4 or ~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
"cors_plug": {:hex, :cors_plug, "2.0.0", "238ddb479f92b38f6dc1ae44b8d81f0387f9519101a6da442d543ab70ee0e482", [:mix], [{:plug, "~> 1.3 or ~> 1.4 or ~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
"cowboy": {:hex, :cowboy, "2.6.1", "f2e06f757c337b3b311f9437e6e072b678fcd71545a7b2865bdaa154d078593f", [:rebar3], [{:cowlib, "~> 2.7.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "~> 1.7.1", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm"},
"cowlib": {:hex, :cowlib, "2.7.0", "3ef16e77562f9855a2605900cedb15c1462d76fb1be6a32fc3ae91973ee543d2", [:rebar3], [], "hexpm"},
"credo": {:hex, :credo, "0.10.2", "03ad3a1eff79a16664ed42fc2975b5e5d0ce243d69318060c626c34720a49512", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm"},
@@ -80,6 +80,7 @@
"phoenix_channel_client": {:hex, :phoenix_channel_client, "0.4.0", "dc1da56f539587a6cc32da7b5c17da3d4066411fe6508035142a595cf451a1d2", [:mix], [{:websocket_client, "~> 1.3", [hex: :websocket_client, repo: "hexpm", optional: true]}], "hexpm"},
"phoenix_html": {:hex, :phoenix_html, "2.13.1", "fa8f034b5328e2dfa0e4131b5569379003f34bc1fafdaa84985b0b9d2f12e68b", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
"plug": {:hex, :plug, "1.7.2", "d7b7db7fbd755e8283b6c0a50be71ec0a3d67d9213d74422d9372effc8e87fd1", [:mix], [{:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}], "hexpm"},
"plug_cowboy": {:hex, :plug_cowboy, "2.0.1", "d798f8ee5acc86b7d42dbe4450b8b0dadf665ce588236eb0a751a132417a980e", [:mix], [{:cowboy, "~> 2.5", [hex: :cowboy, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
"plug_crypto": {:hex, :plug_crypto, "1.0.0", "18e49317d3fa343f24620ed22795ec29d4a5e602d52d1513ccea0b07d8ea7d4d", [:mix], [], "hexpm"},
"poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm"},
"poolboy": {:hex, :poolboy, "1.5.2", "392b007a1693a64540cead79830443abf5762f5d30cf50bc95cb2c1aaafa006b", [:rebar3], [], "hexpm"},

0 comments on commit d27cc4f

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