Skip to content

Commit cb16f06

Browse files
committed
Use Elixir 1.9 releases
1 parent 60d3866 commit cb16f06

File tree

6 files changed

+20
-49
lines changed

6 files changed

+20
-49
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ defaults: &defaults
44
- image: nervesproject/nerves_system_br:1.8.2
55

66
elixir_version: &elixir_version
7-
ELIXIR_VERSION: 1.8.2-otp-22
7+
ELIXIR_VERSION: 1.9.0-otp-22
88

99
install_elixir: &install_elixir
1010
run:

mix.exs

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,20 @@ defmodule CircuitsQuickstart.MixProject do
22
use Mix.Project
33

44
@all_targets [:rpi, :rpi0, :rpi2, :rpi3, :rpi3a, :bbb, :x86_64]
5+
@app :circuits_quickstart
56

67
def project do
78
[
8-
app: :circuits_quickstart,
9-
version: "0.1.0",
10-
elixir: "~> 1.8",
11-
archives: [nerves_bootstrap: "~> 1.5"],
9+
app: @app,
10+
version: "0.2.0",
11+
elixir: "~> 1.9",
12+
archives: [nerves_bootstrap: "~> 1.6"],
1213
start_permanent: Mix.env() == :prod,
1314
build_embedded: true,
1415
aliases: [loadconfig: [&bootstrap/1]],
15-
deps: deps()
16+
deps: deps(),
17+
releases: [{@app, release()}],
18+
preferred_cli_target: [run: :host, test: :host]
1619
]
1720
end
1821

@@ -23,22 +26,28 @@ defmodule CircuitsQuickstart.MixProject do
2326
Mix.Task.run("loadconfig", args)
2427
end
2528

26-
# Run "mix help compile.app" to learn about applications.
2729
def application do
2830
[
2931
extra_applications: [:logger, :runtime_tools, :inets]
3032
]
3133
end
3234

33-
# Run "mix help deps" to learn about dependencies.
35+
def release do
36+
[
37+
overwrite: true,
38+
cookie: "#{@app}_cookie",
39+
include_erts: &Nerves.Release.erts/0,
40+
steps: [&Nerves.Release.init/1, :assemble]
41+
]
42+
end
43+
3444
defp deps do
3545
[
3646
# Dependencies for all targets
3747
{:nerves, "~> 1.5.0", runtime: false},
38-
{:shoehorn, "~> 0.4"},
48+
{:shoehorn, "~> 0.6"},
3949
{:ring_logger, "~> 0.6"},
4050
{:toolshed, "~> 0.2"},
41-
{:distillery, "~> 2.1"},
4251

4352
# Circuits projects
4453
{:circuits_uart, "~> 1.3"},

mix.lock

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
%{
2-
"artificery": {:hex, :artificery, "0.4.2", "3ded6e29e13113af52811c72f414d1e88f711410cac1b619ab3a2666bbd7efd4", [:mix], [], "hexpm"},
32
"circuits_gpio": {:hex, :circuits_gpio, "0.4.1", "344dd34f2517687fd28723e5552571babff5469db05b697181cab860fe7eff23", [:make, :mix], [{:elixir_make, "~> 0.5", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"},
43
"circuits_i2c": {:hex, :circuits_i2c, "0.3.4", "d86951092e44487fe6fecbd6544511d894510be2856280eb93258a171bdc1552", [:make, :mix], [{:elixir_make, "~> 0.5", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"},
54
"circuits_spi": {:hex, :circuits_spi, "0.1.3", "a94889abc874e9976f397c649152776d9c0863e5fd3377203c7f0cf992d9609c", [:make, :mix], [{:elixir_make, "~> 0.5", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"},
65
"circuits_uart": {:hex, :circuits_uart, "1.3.2", "206579d28fcd443881777fadf5ee6af1ea7835a7ccd352b54d73e98ea5266b4c", [:mix], [{:elixir_make, "~> 0.5", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"},
7-
"distillery": {:hex, :distillery, "2.1.1", "f9332afc2eec8a1a2b86f22429e068ef35f84a93ea1718265e740d90dd367814", [:mix], [{:artificery, "~> 0.2", [hex: :artificery, repo: "hexpm", optional: false]}], "hexpm"},
86
"dns": {:hex, :dns, "2.1.2", "81c46d39f7934f0e73368355126e4266762cf227ba61d5889635d83b2d64a493", [:mix], [{:socket, "~> 0.3.13", [hex: :socket, repo: "hexpm", optional: false]}], "hexpm"},
97
"elixir_make": {:hex, :elixir_make, "0.6.0", "38349f3e29aff4864352084fc736fa7fa0f2995a819a737554f7ebd28b85aaab", [:mix], [], "hexpm"},
108
"mdns": {:hex, :mdns, "1.0.3", "f08414daf5636bf5cd364611e838818e9250c91a3282a817ad9174b03e757401", [:mix], [{:dns, "~> 2.0", [hex: :dns, repo: "hexpm", optional: false]}], "hexpm"},

rel/config.exs

Lines changed: 0 additions & 33 deletions
This file was deleted.

rel/plugins/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

rel/vm.args renamed to rel/vm.args.eex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
## for read only filesystem.
66

77
8-
-setcookie vau2epvs37xjsnfxjdprlglrikw5b5eiiezb4ezqbca4hiczja27ai5kceiog5iu
8+
-setcookie <%= @release.options[:cookie] %>
99

1010
## Use Ctrl-C to interrupt the current shell rather than invoking the emulator's
1111
## break handler and possibly exiting the VM.

0 commit comments

Comments
 (0)