Update versions & CI (#27)

* Updated wxWidgets repo and deps

* Update base versions

* fixup

* fix_macos

* fixup

* try wxWidgets v3.2.6

* fixup linux

* Fix iconset creation

* try to fix windows build

Author: dominicletz

.github/workflows/binaries.yml

@@ -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:
@@ -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}
@@ -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

.github/workflows/ci.yml

@@ -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: |

.tool-versions

@@ -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

lib/todo_app/menu.ex

@@ -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

lib/todo_app/menu_bar.ex

@@ -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

lib/todo_web.ex

@@ -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
@@ -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
 
@@ -94,7 +94,7 @@ defmodule TodoWeb do
       import Phoenix.View
 
       import TodoWeb.ErrorHelpers
-      import TodoWeb.Gettext
+      use Gettext, backend: TodoWeb.Gettext
     end
   end
 

lib/todo_web/gettext.ex

@@ -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")
@@ -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

lib/todo_web/templates/layout/live.html.leex

@@ -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>

mix.lock

@@ -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