Skip to content

Commit

Permalink
dep updates
Browse files Browse the repository at this point in the history
  • Loading branch information
gabrielburnworth committed Jul 28, 2023
1 parent 214cc57 commit 7f75901
Show file tree
Hide file tree
Showing 7 changed files with 84 additions and 76 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

# 15.4.4

* Dependency updates.

# 15.4.3

* Rework `photo_grid` lua helper exit upon missing configs.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
15.4.3
15.4.4-rc2
2 changes: 1 addition & 1 deletion lib/core/asset/private.ex
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ defmodule FarmbotOS.Asset.Private do
select: lm.asset_local_id
)

Repo.all(from(data in module, join: lm in subquery(q)))
Repo.all(from(data in module, join: lm in subquery(q), on: true))
end

@doc "Lists `module` objects that have a `local_meta` object"
Expand Down
4 changes: 2 additions & 2 deletions lib/core/config_storage/network_interface.ex
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ defmodule FarmbotOS.Config.NetworkInterface do
import Ecto.Changeset

schema "network_interfaces" do
field(:name, :string, null: false)
field(:type, :string, null: false)
field(:name, :string)
field(:type, :string)

## For wireless interfaces
field(:ssid, :string)
Expand Down
50 changes: 25 additions & 25 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,16 @@ defmodule FarmbotOS.MixProject do
defp deps do
[
{:busybox, "~> 0.1", targets: @all_targets},
{:certifi, "~> 2.8"},
{:circuits_gpio, "~> 1.0", targets: @all_targets},
{:circuits_i2c, "~> 1.0", targets: @all_targets},
{:circuits_uart, "~> 1.4"},
{:cors_plug, "~> 2.0", targets: @all_targets},
{:dns, "~> 2.3"},
{:ecto_sqlite3, "~> 0.7"},
{:ecto, "~> 3.7"},
{:ex_doc, "~> 0.28", only: [:dev], targets: [:host], runtime: false},
{:excoveralls, "~> 0.14", only: [:test], targets: [:host]},
{:certifi, "~> 2.9"},
{:circuits_gpio, "~> 1.1", targets: @all_targets},
{:circuits_i2c, "~> 1.2", targets: @all_targets},
{:circuits_uart, "~> 1.5"},
{:cors_plug, "~> 3.0", targets: @all_targets},
{:dns, "~> 2.4"},
{:ecto_sqlite3, "~> 0.10"},
{:ecto, "~> 3.10"},
{:ex_doc, "~> 0.30", only: [:dev], targets: [:host], runtime: false},
{:excoveralls, "~> 0.16", only: [:test], targets: [:host]},
{:farmbot_system_rpi,
git: "[email protected]:FarmBot/farmbot_system_rpi.git",
tag: "v1.18.1-farmbot.1",
Expand All @@ -121,31 +121,31 @@ defmodule FarmbotOS.MixProject do
tag: "v1.18.1-farmbot.1",
runtime: false,
targets: :rpi4},
{:extty, "~> 0.2"},
{:extty, "~> 0.3"},
{:hackney, "~> 1.18"},
{:jason, "~> 1.3"},
{:jason, "~> 1.4"},
{:luerl, "~> 1.0"},
{:mdns_lite, "~> 0.8", targets: @all_targets},
{:mimic, "~> 1.5", only: :test},
{:mimic, "~> 1.7", only: :test},
{:mix_unused, "~> 0.4", only: :dev},
{:muontrap, "~> 1.0"},
{:nerves_runtime, "~> 0.11", targets: @all_targets},
{:muontrap, "~> 1.3"},
{:nerves_runtime, "~> 0.13", targets: @all_targets},
{:nerves_time, "~> 0.4", targets: @all_targets},
{:nerves, "~> 1.7", runtime: false},
{:phoenix_html, "~> 3.2"},
{:plug_cowboy, "~> 2.5"},
{:ring_logger, "~> 0.8"},
{:phoenix_html, "~> 3.3"},
{:plug_cowboy, "~> 2.6"},
{:ring_logger, "~> 0.10"},
{:rollbax, "~> 0.11"},
{:shoehorn, "~> 0.8"},
{:telemetry, "~> 1.0"},
{:tesla, "~> 1.4"},
{:shoehorn, "~> 0.9"},
{:telemetry, "~> 1.2"},
{:tesla, "~> 1.7"},
{:timex, "~> 3.7"},
{:toolshed, "~> 0.2", targets: @all_targets},
{:toolshed, "~> 0.3", targets: @all_targets},
{:tortoise, "~> 0.10"},
{:uuid, "~> 1.1"},
{:vintage_net_ethernet, "~> 0.10", targets: @all_targets},
{:vintage_net_wifi, "~> 0.10", targets: @all_targets},
{:vintage_net, "~> 0.11", targets: @all_targets}
{:vintage_net_ethernet, "~> 0.11", targets: @all_targets},
{:vintage_net_wifi, "~> 0.11", targets: @all_targets},
{:vintage_net, "~> 0.13", targets: @all_targets}
]
end

Expand Down
96 changes: 50 additions & 46 deletions mix.lock

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ defmodule FarmbotOS.FarmEventWorker.RegimenEventTest do
test "removes regimen instance" do
FarmbotOS.Asset.update_device!(%{timezone: "America/Chicago"})
regimen = AssetFixtures.regimen(%{})
farm_event = AssetFixtures.regimen_event(regimen, %{})
farm_event = AssetFixtures.regimen_event(regimen, %{id: 123})
args = %{}

RegimenEvent.init([farm_event, args])
Expand Down

0 comments on commit 7f75901

Please sign in to comment.