Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions .github/workflows/binaries.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: "Build binaries"
on: ["push", "pull_request"]
env:
OTP_GITHUB_URL: https://github.com/erlang/otp.git
OTP_VERSION: OTP-24.3.4.15
OTP_GITHUB_URL: https://github.com/diodechain/otp.git
OTP_VERSION: OTP-26.2.5.9_diode
WXWIDGETS_REPO: https://github.com/wxWidgets/wxWidgets.git
WXWIDGETS_VERSION: master
ELIXIR_VERSION: 1.14.5
ELIXIR_VARIANT: -otp-24
WXWIDGETS_VERSION: v3.2.6
ELIXIR_VERSION: 1.16.3
ELIXIR_VARIANT: -otp-26
DOCKER_BUILDKIT: 0

jobs:
Expand Down Expand Up @@ -106,8 +106,7 @@ jobs:
uses: msys2/setup-msys2@v2
with:
install: pacman-mirrors pkg-config base-devel mingw-w64-x86_64-toolchain mingw-w64-x86_64-go upx mingw-w64-x86_64-dlfcn unzip git tar mingw-w64-x86_64-nodejs mingw-w64-x86_64-imagemagick mingw-w64-x86_64-osslsigncode autoconf automake libtool gettext-devel gettext
update: false
release: false
update: true

- name: Locate Erlang
shell: msys2 {0}
Expand Down Expand Up @@ -164,7 +163,7 @@ jobs:
_build/prod/*.exe

macos:
runs-on: macos-11
runs-on: macos-13
steps:
- name: macOS Cache
uses: actions/cache@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ jobs:
- name: Setup elixir
uses: erlef/setup-beam@v1
with:
elixir-version: "1.14.5"
otp-version: "24.3.3"
elixir-version: "1.16.3"
otp-version: "26.2.5.9"

- uses: actions/checkout@v1
- run: |
Expand Down
4 changes: 2 additions & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
elixir 1.14.5-otp-24
erlang 24.3.4.13
elixir 1.16.3-otp-26
erlang 26.2.5.9
2 changes: 1 addition & 1 deletion lib/todo_app/menu.ex
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ defmodule TodoApp.Menu do
@moduledoc """
Menu that is shown when a user click on the taskbar icon of the TodoApp
"""
import TodoWeb.Gettext
use Gettext, backend: TodoWeb.Gettext
use Desktop.Menu

def handle_event(command, menu) do
Expand Down
2 changes: 1 addition & 1 deletion lib/todo_app/menu_bar.ex
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ defmodule TodoApp.MenuBar do
Menubar that is shown as part of the main Window on Windows/Linux. In
MacOS this Menubar appears at the very top of the screen.
"""
import TodoWeb.Gettext
use Gettext, backend: TodoWeb.Gettext
use Desktop.Menu
alias TodoApp.Todo
alias Desktop.Window
Expand Down
6 changes: 3 additions & 3 deletions lib/todo_web.ex
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ defmodule TodoWeb do
use Phoenix.Controller, namespace: TodoWeb

import Plug.Conn
import TodoWeb.Gettext
use Gettext, backend: TodoWeb.Gettext
alias TodoWeb.Router.Helpers, as: Routes
end
end
Expand Down Expand Up @@ -77,7 +77,7 @@ defmodule TodoWeb do
def channel do
quote do
use Phoenix.Channel
import TodoWeb.Gettext
use Gettext, backend: TodoWeb.Gettext
end
end

Expand All @@ -94,7 +94,7 @@ defmodule TodoWeb do
import Phoenix.View

import TodoWeb.ErrorHelpers
import TodoWeb.Gettext
use Gettext, backend: TodoWeb.Gettext
end
end

Expand Down
4 changes: 2 additions & 2 deletions lib/todo_web/gettext.ex
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ defmodule TodoWeb.Gettext do
By using [Gettext](https://hexdocs.pm/gettext),
your module gains a set of macros for translations, for example:

import TodoWeb.Gettext
use Gettext, backend: TodoWeb.Gettext

# Simple translation
gettext("Here is the string to translate")
Expand All @@ -20,5 +20,5 @@ defmodule TodoWeb.Gettext do

See the [Gettext Docs](https://hexdocs.pm/gettext) for detailed usage.
"""
use Gettext, otp_app: :todo_app
use Gettext.Backend, otp_app: :todo_app
end
4 changes: 2 additions & 2 deletions lib/todo_web/templates/layout/live.html.leex
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<main role="main" class="container">
<p class="alert alert-info" role="alert"
phx-click="lv:clear-flash"
phx-value-key="info"><%= live_flash(@flash, :info) %></p>
phx-value-key="info"><%= Phoenix.Flash.get(@flash, :info) %></p>

<p class="alert alert-danger" role="alert"
phx-click="lv:clear-flash"
phx-value-key="error"><%= live_flash(@flash, :error) %></p>
phx-value-key="error"><%= Phoenix.Flash.get(@flash, :error) %></p>

<%= @inner_content %>
</main>
64 changes: 32 additions & 32 deletions mix.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion scripts/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ARG WXWIDGETS_VERSION
ENV WXWIDGETS_VERSION=${WXWIDGETS_VERSION:-master}
RUN cd ~/projects/wxWidgets && \
git fetch origin && \
git reset --hard origin/${WXWIDGETS_VERSION} && \
git reset --hard ${WXWIDGETS_VERSION} && \
git submodule update --init

# ENV WXWIDGETS_DEBUG=--enable-debug
Expand Down
Loading