chore: update xcode version in deploy.yml

2026-07-22 16:49:02 +03:00 · 2026-07-20 14:30:26 +08:00 · 2026-07-20 14:26:12 +08:00
26 changed files with 53 additions and 75 deletions
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -501,7 +501,7 @@ jobs:
    - name: 'Setup xcode'
      uses: maxim-lobanov/setup-xcode@v1
      with:
-        xcode-version: '26.3.0'
+        xcode-version: '26.0'

    - name: 'Install Qt'
      uses: jurplel/install-qt-action@v4
@@ -531,8 +531,6 @@ jobs:
        QT_INSTALL_DIR: ${{ runner.temp }}
        CODESIGN_SIGNATURE: ${{ secrets.MAC_SIGNER_ID }}
        CODESIGN_INSTALLER_SIGNATURE: ${{ secrets.MAC_INSTALLER_SIGNER_ID }}
-        CODESIGN_KEYCHAIN: ${{ steps.setup-keychain.outputs.keychain-path }}
-        CODESIGN_INSTALLER_KEYCHAIN: ${{ steps.setup-keychain.outputs.keychain-path }}
        NOTARYTOOL_TEAM_ID: ${{ secrets.MAC_TEAM_ID }}
        NOTARYTOOL_EMAIL: ${{ secrets.APPLE_DEV_EMAIL }}
        NOTARYTOOL_PASSWORD: ${{ secrets.APPLE_DEV_PASSWORD }}
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

 set(PROJECT AmneziaVPN)
-set(AMNEZIAVPN_VERSION 4.9.0.7)
+set(AMNEZIAVPN_VERSION 4.9.0.4)

 set(QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP ON CACHE BOOL "" FORCE)
 set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES
@@ -28,7 +28,7 @@ string(TIMESTAMP CURRENT_DATE "%Y-%m-%d")
 set(RELEASE_DATE "${CURRENT_DATE}")

 set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
-set(APP_ANDROID_VERSION_CODE 2134)
+set(APP_ANDROID_VERSION_CODE 2133)

 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
    set(MZ_PLATFORM_NAME "linux")
--- a/README.md
+++ b/README.md
@@ -38,14 +38,14 @@

 ## Links

- [https://amnezia.org](https://amnezia.org/?utm_source=github&utm_campaign=amnezia_website-read) - Project website | [Alternative link (mirror)](https://storage.googleapis.com/amnezia/amnezia.org/utm_source=github&utm_campaign=amnezia_website-read)
- [https://docs.amnezia.org](https://docs.amnezia.org/?utm_source=github&utm_campaign=amnezia_website-read) - Documentation
+- [https://amnezia.org](https://amnezia.org) - Project website | [Alternative link (mirror)](https://storage.googleapis.com/kldscp/amnezia.org)
+- [https://docs.amnezia.org](https://docs.amnezia.org) - Documentation
 - [https://www.reddit.com/r/AmneziaVPN](https://www.reddit.com/r/AmneziaVPN) - Reddit  
- [https://telegram.me/amnezia_vpn_en](https://telegram.me/amnezia_vpn_en) - Telegram support channel (English) 
- [https://telegram.me/amnezia_vpn_ir](https://telegram.me/amnezia_vpn_ir) - Telegram support channel (Farsi) 
- [https://telegram.me/amnezia_vpn_mm](https://telegram.me/amnezia_vpn_mm) - Telegram support channel (Myanmar)  
- [https://telegram.me/amnezia_vpn](https://telegram.me/amnezia_vpn) - Telegram support channel (Russian)
- [Get Premium for 6 or 12 months](https://storage.googleapis.com/amnezia/pay/?utm_source=github&utm_campaign=ampay-read)
+- [https://t.me/amnezia_vpn_en](https://t.me/amnezia_vpn_en) - Telegram support channel (English) 
+- [https://t.me/amnezia_vpn_ir](https://t.me/amnezia_vpn_ir) - Telegram support channel (Farsi) 
+- [https://t.me/amnezia_vpn_mm](https://t.me/amnezia_vpn_mm) - Telegram support channel (Myanmar)  
+- [https://t.me/amnezia_vpn](https://t.me/amnezia_vpn) - Telegram support channel (Russian)
+- [https://vpnpay.io/en/amnezia-premium/](https://vpnpay.io/en/amnezia-premium/) - Amnezia Premium

 ## Tech

--- a/README_RU.md
+++ b/README_RU.md
@@ -35,14 +35,14 @@

 ## Ссылки

- [https://amnezia.org](https://amnezia.org/?utm_source=github&utm_campaign=amnezia_website-read) - Веб-сайт проекта | [Альтернативная ссылка (зеркало)](https://storage.googleapis.com/amnezia/amnezia.org/utm_source=github&utm_campaign=amnezia_website-read)
- [https://docs.amnezia.org](https://docs.amnezia.org/?utm_source=github&utm_campaign=amnezia_website-read) - Документация
+- [https://amnezia.org](https://amnezia.org) - Веб-сайт проекта | [Альтернативная ссылка (зеркало)](https://storage.googleapis.com/kldscp/amnezia.org)
+- [https://docs.amnezia.org](https://docs.amnezia.org) - Документация
 - [https://www.reddit.com/r/AmneziaVPN](https://www.reddit.com/r/AmneziaVPN) - Reddit  
- [https://telegram.me/amnezia_vpn_en](https://telegram.me/amnezia_vpn_en) - Канал поддержки в Telegram (Английский)
- [https://telegram.me/amnezia_vpn_ir](https://telegram.me/amnezia_vpn_ir) - Канал поддержки в Telegram (Фарси)
- [https://telegram.me/amnezia_vpn_mm](https://telegram.me/amnezia_vpn_mm) - Канал поддержки в Telegram (Мьянма) 
- [https://telegram.me/amnezia_vpn](https://telegram.me/amnezia_vpn) - Канал поддержки в Telegram  (Русский)
- [Оформите Premium на 6 или 12 месяцев](https://storage.googleapis.com/amnezia/pay/?utm_source=github&utm_campaign=ampay-read)
+- [https://t.me/amnezia_vpn_en](https://t.me/amnezia_vpn_en) - Канал поддержки в Telegram (Английский)
+- [https://t.me/amnezia_vpn_ir](https://t.me/amnezia_vpn_ir) - Канал поддержки в Telegram (Фарси)
+- [https://t.me/amnezia_vpn_mm](https://t.me/amnezia_vpn_mm) - Канал поддержки в Telegram (Мьянма) 
+- [https://t.me/amnezia_vpn](https://t.me/amnezia_vpn) - Канал поддержки в Telegram  (Русский)
+- [https://vpnpay.io/en/amnezia-premium/](https://vpnpay.io/en/amnezia-premium/) - Amnezia Premium | [Зеркало](https://storage.googleapis.com/kldscp/vpnpay.io/ru/amnezia-premium\)

 ## Технологии

--- a/client/cmake/macos_ne.cmake
+++ b/client/cmake/macos_ne.cmake
@@ -133,11 +133,6 @@ target_sources(${PROJECT} PRIVATE
    ${CLIENT_ROOT_DIR}/platforms/ios/StoreKit2Helper.swift
 )

-set_source_files_properties(
-    ${CMAKE_CURRENT_SOURCE_DIR}/macos/app/Images.xcassets
-    PROPERTIES MACOSX_PACKAGE_LOCATION Resources
-)
-
 target_sources(${PROJECT} PRIVATE
    ${CMAKE_CURRENT_SOURCE_DIR}/macos/app/Images.xcassets
    ${CMAKE_CURRENT_SOURCE_DIR}/ios/app/PrivacyInfo.xcprivacy
--- a/client/core/controllers/connectionController.cpp
+++ b/client/core/controllers/connectionController.cpp
@@ -31,6 +31,7 @@ ConnectionController::ConnectionController(SecureServersRepository* serversRepos
    connect(m_vpnConnection, &VpnConnection::connectionStateChanged, this, &ConnectionController::connectionStateChanged);
    connect(this, &ConnectionController::openConnectionRequested, m_vpnConnection, &VpnConnection::connectToVpn, Qt::QueuedConnection);
    connect(this, &ConnectionController::closeConnectionRequested, m_vpnConnection, &VpnConnection::disconnectFromVpn, Qt::QueuedConnection);
+    connect(this, &ConnectionController::setConnectionStateRequested, m_vpnConnection, &VpnConnection::setConnectionState, Qt::QueuedConnection);
    connect(this, &ConnectionController::killSwitchModeChangedRequested, m_vpnConnection, &VpnConnection::onKillSwitchModeChanged, Qt::QueuedConnection);
 #ifdef Q_OS_ANDROID
    connect(this, &ConnectionController::restoreConnectionRequested, m_vpnConnection, &VpnConnection::restoreConnection, Qt::QueuedConnection);
@@ -44,7 +45,9 @@ bool ConnectionController::isConnected() const

 void ConnectionController::setConnectionState(Vpn::ConnectionState state)
 {
-    emit connectionStateChanged(state);
+    if (m_vpnConnection) {
+        emit setConnectionStateRequested(state);
+    }
 }

 ErrorCode ConnectionController::defaultContainerForServer(const QString &serverId, DockerContainer &container) const
--- a/client/core/controllers/connectionController.h
+++ b/client/core/controllers/connectionController.h
@@ -67,6 +67,7 @@ signals:
    void connectionStateChanged(Vpn::ConnectionState state);
    void openConnectionRequested(const QString &serverId, DockerContainer container, const QJsonObject &vpnConfiguration);
    void closeConnectionRequested();
+    void setConnectionStateRequested(Vpn::ConnectionState state);
    void killSwitchModeChangedRequested(bool enabled);

 #ifdef Q_OS_ANDROID
--- a/client/core/controllers/coreController.cpp
+++ b/client/core/controllers/coreController.cpp
@@ -285,10 +285,6 @@ void CoreController::initSignalHandlers()
    if (m_serversUiController->hasServersFromGatewayApi()) {
        m_apiNewsUiController->fetchNews(false);
    }
-
-    #if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
-        m_updateController->checkForUpdates();
-    #endif    
 }

 void CoreController::updateTranslator(const QLocale &locale)
--- a/client/core/controllers/coreSignalHandlers.cpp
+++ b/client/core/controllers/coreSignalHandlers.cpp
@@ -440,6 +440,9 @@ void CoreSignalHandlers::initNotificationHandler()
 void CoreSignalHandlers::initUpdateFoundHandler()
 {
 #if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+    connect(m_coreController->m_apiNewsUiController, &ApiNewsUiController::fetchNewsFinished, m_coreController->m_updateUiController,
+            &UpdateUiController::checkForUpdates);
+
    connect(m_coreController->m_updateUiController, &UpdateUiController::updateFound, this, [this]() {
        const QString version = m_coreController->m_updateUiController->getVersion();
        const QString updateId = version.isEmpty() ? QStringLiteral("update") : QStringLiteral("update-%1").arg(version);
--- a/client/core/utils/constants/protocolConstants.h
+++ b/client/core/utils/constants/protocolConstants.h
@@ -64,7 +64,7 @@ namespace amnezia
            constexpr char defaultFlow[] = "xtls-rprx-vision";
            constexpr char defaultTransport[] = "raw";
            constexpr char defaultFingerprint[] = "chrome";
-            constexpr char defaultSni[] = "www.googletagmanager.com";
+            constexpr char defaultSni[] = "cdn.example.com";
            constexpr char defaultAlpn[] = "HTTP/2";

            constexpr char defaultXhttpMode[] = "Auto";
--- a/client/macos/app/Info.plist.in
+++ b/client/macos/app/Info.plist.in
@@ -44,20 +44,8 @@
 		<key>NSAllowsLocalNetworking</key>
 		<true/>
 	</dict>
-	<key>CFBundleIconName</key>
-	<string>AppIcon</string>
 	<key>CFBundleIcons</key>
-	<dict>
-		<key>CFBundlePrimaryIcon</key>
-		<dict>
-			<key>CFBundleIconFiles</key>
-			<array>
-				<string>AppIcon</string>
-			</array>
-			<key>CFBundleIconName</key>
-			<string>AppIcon</string>
-		</dict>
-	</dict>
+        <dict/>
 	<key>UTImportedTypeDeclarations</key>
 	<array>
 		<dict>
--- a/client/ui/controllers/connectionUiController.cpp
+++ b/client/ui/controllers/connectionUiController.cpp
@@ -29,7 +29,6 @@ void ConnectionUiController::openConnection()
 {
    const QString serverId = m_serversController->getDefaultServerId();
    if (serverId.isEmpty()) {
-        m_connectionController->setConnectionState(Vpn::ConnectionState::Disconnected);
        return;
    }

--- a/client/ui/controllers/selfhosted/installUiController.cpp
+++ b/client/ui/controllers/selfhosted/installUiController.cpp
@@ -635,7 +635,6 @@ void InstallUiController::validateConfig()
 {
    const QString serverId = m_serversController->getDefaultServerId();
    if (serverId.isEmpty()) {
-        emit configValidated(false);
        return;
    }
    m_installController->validateConfig(serverId);
--- a/client/ui/qml/Controls2/ContextMenuType.qml
+++ b/client/ui/qml/Controls2/ContextMenuType.qml
@@ -4,7 +4,7 @@ import QtQuick.Controls
 Menu {
    property var textObj

-    popupType: Popup.Native
+    popupType: Qt.platform.os === "ios" ? Popup.Item : Popup.Native

    property Item inputBlocker: null

--- a/client/ui/qml/Controls2/TextAreaType.qml
+++ b/client/ui/qml/Controls2/TextAreaType.qml
@@ -93,7 +93,7 @@ Rectangle {

                wrapMode: Text.Wrap

-                ContextMenu.menu: contextMenu
+                ContextMenu.menu: Qt.platform.os === "ios" ? null : contextMenu

                ContextMenuType {
                    id: contextMenu
--- a/client/ui/qml/Controls2/TextAreaWithFooterType.qml
+++ b/client/ui/qml/Controls2/TextAreaWithFooterType.qml
@@ -79,7 +79,7 @@ Rectangle {

                wrapMode: Text.Wrap

-                ContextMenu.menu: contextMenu
+                ContextMenu.menu: Qt.platform.os === "ios" ? null : contextMenu

                ContextMenuType {
                    id: contextMenu
--- a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
+++ b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
@@ -144,7 +144,7 @@ Item {
                            }
                        }

-                        ContextMenu.menu: contextMenu
+                        ContextMenu.menu: Qt.platform.os === "ios" ? null : contextMenu

                        ContextMenuType {
                            id: contextMenu
--- a/client/ui/qml/Pages2/PageSettingsNewsNotifications.qml
+++ b/client/ui/qml/Pages2/PageSettingsNewsNotifications.qml
@@ -69,7 +69,9 @@ PageType {
                    rightImageSource: "qrc:/images/controls/chevron-right.svg"

                    clickedFunction: function() {
-                        NewsModel.markAsRead(index)
+                        if (!isUpdate) {
+                            NewsModel.markAsRead(index)
+                        }
                        NewsModel.processedIndex = index
                        PageController.goToPage(PageEnum.PageSettingsNewsDetail)
                    }
--- a/conanfile.py
+++ b/conanfile.py
@@ -19,26 +19,26 @@ class AmneziaVPN(ConanFile):

        if has_service:
            if os == "Windows":
-                self.requires("awg-windows/0.2.0")
+                self.requires("awg-windows/0.1.9")
                self.requires("tap-windows6/9.27.0")
                self.requires("win-split-tunnel/1.2.5.0")
                self.requires("wintun/0.14.1")
            else:
-                self.requires("awg-go/0.2.19")
+                self.requires("awg-go/0.2.18")

-            self.requires("amnezia-xray-bindings/1.2.0")
+            self.requires("amnezia-xray-bindings/1.1.0")
            self.requires("tun2socks/2.6.0")
            self.requires("openvpn/2.7.0")
            self.requires("v2ray-rules-dat/202603162227")

        if has_ne:
-            self.requires("awg-apple/2.0.3")
+            self.requires("awg-apple/2.0.2")
            self.requires("hev-socks5-tunnel/2.15.0", options={"as_framework": True})
            self.requires("openvpnadapter/1.0.0")

        if os == "Android":
-            self.requires("amnezia-libxray/1.0.1")
-            self.requires("awg-android/2.0.2")
+            self.requires("amnezia-libxray/1.0.0")
+            self.requires("awg-android/2.0.1")
            self.requires("openvpn-pt-android/1.0.0")

        # expicitly use libssh@amnezia to prevent it from being downloaded from conan-center
--- a/recipes/amnezia-libxray/conanfile.py
+++ b/recipes/amnezia-libxray/conanfile.py
@@ -11,7 +11,7 @@ from pathlib import Path

 class AmneziaLibxray(ConanFile):
    name = "amnezia-libxray"
-    version = "1.0.1"
+    version = "1.0.0"
    settings = "os", "arch", "compiler"

    def configure(self):
@@ -29,8 +29,8 @@ class AmneziaLibxray(ConanFile):
            raise ConanInvalidConfiguration(f"{self.name} v{self.version} does not support {self.settings.os}")

    def source(self):
-        get(self, f"https://github.com/amnezia-vpn/amnezia-libxray/archive/refs/tags/v{self.version}.zip",
-            sha256="f17bca781d4a2fad4dfda9e8b1c0f6960a3f75f6218b906b1b0e2458652ffa5a", strip_root=True
+        get(self, "https://github.com/amnezia-vpn/amnezia-libxray/archive/refs/tags/v1.0.0.zip",
+            sha256="0c50c5acd5063a9fc3cfbb5b3e11481d30cfa3762b3cb1d72130248ff498e9df", strip_root=True
        )

    def generate(self):
--- a/recipes/amnezia-xray-bindings/conanfile.py
+++ b/recipes/amnezia-xray-bindings/conanfile.py
@@ -13,7 +13,7 @@ import shlex

 class AmneziaXrayBindings(ConanFile):
    name = "amnezia-xray-bindings"
-    version = "1.2.0"
+    version = "1.1.0"
    settings = "os", "arch", "compiler"

    _arch_map = {
@@ -76,8 +76,8 @@ class AmneziaXrayBindings(ConanFile):
            )

    def source(self):
-        get(self, f"https://github.com/amnezia-vpn/amnezia-xray-bindings/archive/v{self.version}.zip",
-            sha256="45b687dcd90cf1d953ece9c9f42d0b02785b2bbb33a97f5bad229f048da34d7c", strip_root=True)
+        get(self, "https://github.com/amnezia-vpn/amnezia-xray-bindings/archive/v1.1.0.zip",
+            sha256="6ea768ec7002cedd422a39aea17704b888acaf794432aa5937cfc92fb6d80eb5", strip_root=True)

    def generate(self):
        tc = AutotoolsToolchain(self)
--- a/recipes/awg-android/conanfile.py
+++ b/recipes/awg-android/conanfile.py
@@ -9,7 +9,7 @@ import platform

 class AwgAndroid(ConanFile):
    name = "awg-android"
-    version = "2.0.2"
+    version = "2.0.1"
    settings = "os", "arch", "build_type", "compiler"

    def configure(self):
--- a/recipes/awg-apple/conanfile.py
+++ b/recipes/awg-apple/conanfile.py
@@ -9,7 +9,7 @@ import os

 class AwgApple(ConanFile):
    name = "awg-apple"
-    version = "2.0.3"
+    version = "2.0.2"
    settings = "os", "arch", "compiler"

    @property
@@ -39,7 +39,7 @@ class AwgApple(ConanFile):

    def source(self):
        get(self, f"https://github.com/amnezia-vpn/amneziawg-apple/archive/refs/tags/v{self.version}.zip",
-            sha256="a868f0dfbded869b6c08b7a7a0e8c1a5485e649a179f4d1715b1b93664ea4fd4", strip_root=True
+            sha256="a04f49eac9f82bbf5dd9031bab188d44de2b3482efde1b6e970821de1d5a3c5d", strip_root=True
        )

    def generate(self):
--- a/recipes/awg-go/conanfile.py
+++ b/recipes/awg-go/conanfile.py
@@ -14,7 +14,7 @@ import shlex

 class AwgGo(ConanFile):
    name = "awg-go"
-    version = "0.2.19"
+    version = "0.2.18"
    package_type = "application"
    settings = "os", "arch"

@@ -61,7 +61,7 @@ class AwgGo(ConanFile):

    def source(self):
        get(self, f"https://github.com/amnezia-vpn/amneziawg-go/archive/refs/tags/v{self.version}.zip",
-            sha256="430396f9f2d4f6559ac69f178b707f955f7f847723b78e9de748b73d7e718798", strip_root=True
+            sha256="58eefbd012e79bd1525f0e02d748979e9480acc1a339df8ceb3b9ffafcedb1ba", strip_root=True
        )

    def generate(self):
--- a/recipes/awg-windows/conanfile.py
+++ b/recipes/awg-windows/conanfile.py
@@ -8,7 +8,7 @@ import os

 class AwgWindows(ConanFile):
    name = "awg-windows"
-    version = "0.2.0"
+    version = "0.1.9"
    settings = "os", "arch"

    @property
@@ -63,7 +63,7 @@ class AwgWindows(ConanFile):

    def source(self):
        get(self, f"https://github.com/amnezia-vpn/amneziawg-windows/archive/refs/tags/v{self.version}.zip",
-            sha256="9e74240b9bae2f9c8a9381bdf6e5a43ad37653de186e01e0f5a92935e4310252", strip_root=True)
+            sha256="5c29a75cb2beae291cc51b64840a39f838da5f300b9e956f7964813a687ec74c", strip_root=True)
        
    def generate(self):
        tc = AutotoolsToolchain(self)
--- a/service/server/CMakeLists.txt
+++ b/service/server/CMakeLists.txt
@@ -333,12 +333,6 @@ if(APPLE)
        DESTINATION ${CMAKE_INSTALL_BINDIR}
        COMPONENT AmneziaVPN
    )
-    add_custom_command(TARGET ${PROJECT} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E $<IF:$<CONFIG:Debug>,copy_directory,true>
-        ${CMAKE_SOURCE_DIR}/deploy/data/macos/pf
-        "$<TARGET_FILE_DIR:${PROJECT}>/pf"
-        COMMAND_EXPAND_LISTS
-    )
 endif()

 # install non-linked dependencies
Author	SHA1	Message	Date
vkamn	580cfe971e	chore: update xcode version in deploy.yml	2026-07-20 14:30:26 +08:00
vkamn	e3435ef18d	chore: update xcode version in deploy.yml	2026-07-20 14:26:12 +08:00