diff --git a/README.md b/README.md index ae72bba..9d39796 100644 --- a/README.md +++ b/README.md @@ -355,7 +355,7 @@ task build:all ## Versioning -Current version in this repo is `4.6.0`. +Current version in this repo is `4.6.1`. - **`package.json`** `version` is the only value you edit for a release bump. - Run **`pnpm run version:sync`** (also run at the start of **`pnpm run build`**) to propagate that version into **`pyproject.toml`**, **`meshchatx/src/version.py`**, **`THIRD_PARTY_NOTICES.txt`** (product line), **README** / **lang/README.\*** “current version” lines, **`docs/meshchatx_on_raspberry_pi.md`** pipx example, and **`packaging/arch/PKGBUILD`** helpers. diff --git a/android/app/build.gradle b/android/app/build.gradle index 01a8948..f866dd3 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -46,8 +46,8 @@ android { applicationId "com.meshchatx" minSdk 24 targetSdk 35 - versionCode 46000 - versionName "4.6.0" + versionCode 46001 + versionName "4.6.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" ndk { diff --git a/docs/meshchatx_on_raspberry_pi.md b/docs/meshchatx_on_raspberry_pi.md index 0234ae4..b02b125 100644 --- a/docs/meshchatx_on_raspberry_pi.md +++ b/docs/meshchatx_on_raspberry_pi.md @@ -61,17 +61,17 @@ source ~/.profile ## 3) Install MeshChatX with pipx (recommended) -Preferred option (recommended): install from a release wheel (4.6.0 or newer), +Preferred option (recommended): install from a release wheel (4.6.1 or newer), because the wheel bundles frontend assets. ```bash pipx install /path/to/reticulum_meshchatx--py3-none-any.whl ``` -Direct example (v4.6.0): +Direct example (v4.6.1): ```bash -pipx install "https://github.com/Quad4-Software/MeshChatX/releases/download/v4.6.0-rc.1/reticulum_meshchatx-4.6.0-py3-none-any.whl" +pipx install "https://github.com/Quad4-Software/MeshChatX/releases/download/v4.6.1/reticulum_meshchatx-4.6.1-py3-none-any.whl" ``` `py3-none-any` wheels are architecture-independent, so the same wheel artifact @@ -93,7 +93,7 @@ cd ~/meshchatx python3 -m venv .venv source .venv/bin/activate python -m pip install --upgrade pip -python -m pip install "https://github.com/Quad4-Software/MeshChatX/releases/download/v4.6.0-rc.1/reticulum_meshchatx-4.6.0-py3-none-any.whl" +python -m pip install "https://github.com/Quad4-Software/MeshChatX/releases/download/v4.6.1/reticulum_meshchatx-4.6.1-py3-none-any.whl" ``` Run command in venv mode: diff --git a/lang/README.de.md b/lang/README.de.md index ee9c5bd..bbd6df9 100644 --- a/lang/README.de.md +++ b/lang/README.de.md @@ -340,7 +340,7 @@ task build:all ## Versionierung -Aktuelle Version in diesem Repository: `4.6.0`. +Aktuelle Version in diesem Repository: `4.6.1`. - Fuer Release-Bumps bearbeiten Sie **nur** `version` in **`package.json`**. - **`pnpm run version:sync`** (wird auch zu Beginn von **`pnpm run build`** ausgefuehrt) verbreitet diese Version in **`pyproject.toml`**, **`meshchatx/src/version.py`**, **`THIRD_PARTY_NOTICES.txt`** (Produktzeile), **README** / **lang/README.\*** (Zeilen mit aktueller Version), **`docs/meshchatx_on_raspberry_pi.md`** (pipx-Beispiel) und Hilfsfelder in **`packaging/arch/PKGBUILD`**. diff --git a/lang/README.it.md b/lang/README.it.md index f30ea6c..20ddbb6 100644 --- a/lang/README.it.md +++ b/lang/README.it.md @@ -340,7 +340,7 @@ Scorciatoie `Makefile`: ## Versionamento -Versione attuale nel repository: `4.6.0`. +Versione attuale nel repository: `4.6.1`. - L'unico valore che modifichi per un bump di release e **`version` in `package.json`**. - Esegui **`pnpm run version:sync`** (all'inizio anche di **`pnpm run build`**) per propagare in **`pyproject.toml`**, **`meshchatx/src/version.py`**, **`THIRD_PARTY_NOTICES.txt`** (riga prodotto), **README** / **lang/README.\*** (righe "versione attuale"), **esempio pipx in `docs/meshchatx_on_raspberry_pi.md`**, e aiuti in **`packaging/arch/PKGBUILD`**. diff --git a/lang/README.ja.md b/lang/README.ja.md index aec9849..f31f461 100644 --- a/lang/README.ja.md +++ b/lang/README.ja.md @@ -340,7 +340,7 @@ task build:all ## バージョン管理 -このリポジトリの現在のバージョンは `4.6.0` です。 +このリポジトリの現在のバージョンは `4.6.1` です。 - リリースのバージョン上げは **`package.json` の `version` のみ**編集します。 - **`pnpm run version:sync`**(**`pnpm run build`** 開始時にも実行)で、**`pyproject.toml`**、**`meshchatx/src/version.py`**、**`THIRD_PARTY_NOTICES.txt`**(製品行)、**README** / **lang/README.\***(現在のバージョン行)、**`docs/meshchatx_on_raspberry_pi.md`** の pipx 例、**`packaging/arch/PKGBUILD`** の補助フィールドに反映します。 diff --git a/lang/README.ru.md b/lang/README.ru.md index 5f133fb..df2a888 100644 --- a/lang/README.ru.md +++ b/lang/README.ru.md @@ -340,7 +340,7 @@ task build:all ## Версионирование -Текущая версия в репозитории: `4.6.0`. +Текущая версия в репозитории: `4.6.1`. - Редактируйте для релизного бампа **только** поле `version` в **`package.json`**. - Команда **`pnpm run version:sync`** (также в начале **`pnpm run build`**) распространяет эту версию в **`pyproject.toml`**, **`meshchatx/src/version.py`**, **`THIRD_PARTY_NOTICES.txt`** (строка продукта), **README** / **lang/README.\*** (строки «текущая версия»), **`docs/meshchatx_on_raspberry_pi.md`** (пример pipx) и вспомогательные поля **`packaging/arch/PKGBUILD`**. diff --git a/lang/README.zh.md b/lang/README.zh.md index 6a97df9..a541e9d 100644 --- a/lang/README.zh.md +++ b/lang/README.zh.md @@ -340,7 +340,7 @@ task build:all ## 版本管理 -本仓库当前版本: `4.6.0`。 +本仓库当前版本: `4.6.1`。 - 发布版本号**只**改 **`package.json` 的 `version`**。 - 运行 **`pnpm run version:sync`**(在 **`pnpm run build`** 开头也会执行)可将该版本同步到 **`pyproject.toml`**、**`meshchatx/src/version.py`**、**`THIRD_PARTY_NOTICES.txt`**(产品行)、**README** / **lang/README.\*** 中的“当前版本”行、**`docs/meshchatx_on_raspberry_pi.md`** 的 pipx 示例,以及 **`packaging/arch/PKGBUILD`** 的辅助字段。 diff --git a/meshchatx/__init__.py b/meshchatx/__init__.py index 12706a9..bb67332 100644 --- a/meshchatx/__init__.py +++ b/meshchatx/__init__.py @@ -3,4 +3,4 @@ """Reticulum MeshChatX - A mesh network communications app.""" # Synced from package.json via scripts/sync_version.js (also writes meshchatx/src/version.py). -__version__ = "4.6.0" +__version__ = "4.6.1" diff --git a/meshchatx/src/backend/data/THIRD_PARTY_NOTICES.txt b/meshchatx/src/backend/data/THIRD_PARTY_NOTICES.txt index 59b2908..d2e5520 100644 --- a/meshchatx/src/backend/data/THIRD_PARTY_NOTICES.txt +++ b/meshchatx/src/backend/data/THIRD_PARTY_NOTICES.txt @@ -82,7 +82,7 @@ pycparser 3.0 pyserial 3.5 License: BSD Author: Chris Liechti -reticulum-meshchatx 4.6.0 +reticulum-meshchatx 4.6.1 License: 0BSD AND MIT Author: Quad4 rns 1.2.0 diff --git a/meshchatx/src/version.py b/meshchatx/src/version.py index 9fee25d..8dc75eb 100644 --- a/meshchatx/src/version.py +++ b/meshchatx/src/version.py @@ -3,4 +3,4 @@ Do not edit by hand. Run: pnpm run version:sync """ -__version__ = "4.6.0" +__version__ = "4.6.1" diff --git a/package.json b/package.json index 4dc1030..02d790f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "reticulum-meshchatx", - "version": "4.6.0", + "version": "4.6.1", "description": "A simple mesh network communications app powered by the Reticulum Network Stack", "homepage": "https://git.quad4.io/RNS-Things/MeshChatX", "desktopName": "reticulum-meshchatx.desktop", diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index 0da8882..9fd3445 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Ivan pkgname=reticulum-meshchatx-git _pkgname=reticulum-meshchatx -pkgver=4.6.0.r0.gebacc00 +pkgver=4.6.1.r0.gebacc00 pkgrel=1 pkgdesc="A simple mesh network communications app powered by the Reticulum Network Stack" arch=('x86_64' 'aarch64') @@ -19,7 +19,7 @@ sha256sums=('SKIP' pkgver() { cd "$_pkgname" git describe --long --tags 2>/dev/null | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' || \ - printf "4.6.0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + printf "4.6.1.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } prepare() { diff --git a/pyproject.toml b/pyproject.toml index 87e2fe8..1d69bc5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "reticulum-meshchatx" -version = "4.6.0" +version = "4.6.1" description = "A simple mesh network communications app powered by the Reticulum Network Stack" authors = [ {name = "Quad4"}