[PR #2940] [CLOSED] feat: defines #3021

New issue

Closed

opened 2026-10-14 21:06:56 +00:00 by bsakaguchi · 0 comments

bsakaguchi commented

2026-10-14 21:06:56 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/2940
Author: @vkamn
Created: 8/5/2026
Status: ❌ Closed

Base: dev ← Head: feat/defines

📝 Commits (10+)

724dc1d feat: move amnezia hardcode from sources to cmake
c2f443d feat: move amnezia hardcode from sources to cmake
89da125 refactor: remove prem v1 migration
4ba660b chore: move more branding
6f38768 fix: use host-matching architecture for iOS simulator builds
0370efa fix: mark the branded media assets catalog as a bundle resource
995ae17 fix: parametrize the Swift app-group identifier used by Log.swift
ed62914 fix: use APPLICATION_NAME instead of hardcoded Amnezia in log line format
fc035bb fix: restore branding fixes dropped by rebase, rename swiftInterop to swiftBridge
c946675 Merge branch 'dev' of github-amnezia:amnezia-vpn/amnezia-client into HEAD

📊 Changes

43 files changed (+490 additions, -307 deletions)

View changed files

📝 CMakeLists.txt (+3 -1)
📝 client/CMakeLists.txt (+48 -13)
📝 client/amneziaApplication.cpp (+5 -4)
➕ client/cmake/clientBrandingDefaults.cmake (+118 -0)
📝 client/cmake/ios-arch-fixup.cmake (+12 -1)
📝 client/cmake/ios.cmake (+16 -15)
📝 client/cmake/macos_ne.cmake (+11 -10)
📝 client/cmake/sources.cmake (+2 -0)
📝 client/core/controllers/api/subscriptionController.cpp (+3 -2)
📝 client/core/controllers/coreController.cpp (+7 -6)
📝 client/core/controllers/coreSignalHandlers.cpp (+2 -2)
📝 client/core/controllers/selfhosted/exportController.cpp (+2 -1)
📝 client/core/controllers/serversController.cpp (+1 -1)
📝 client/core/controllers/settingsController.cpp (+0 -10)
📝 client/core/controllers/settingsController.h (+0 -3)
📝 client/core/controllers/updateController.cpp (+1 -0)
📝 client/core/repositories/secureAppSettingsRepository.cpp (+0 -10)
📝 client/core/repositories/secureAppSettingsRepository.h (+0 -2)
📝 client/core/utils/api/apiUtils.cpp (+0 -38)
📝 client/core/utils/api/apiUtils.h (+0 -1)

...and 23 more files

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/amnezia-vpn/amnezia-client/pull/2940 **Author:** [@vkamn](https://github.com/vkamn) **Created:** 8/5/2026 **Status:** ❌ Closed **Base:** `dev` ← **Head:** `feat/defines` --- ### 📝 Commits (10+) - [`724dc1d`](https://github.com/amnezia-vpn/amnezia-client/commit/724dc1d86e1ab3c8396fc1e8e2df024b6206fbfc) feat: move amnezia hardcode from sources to cmake - [`c2f443d`](https://github.com/amnezia-vpn/amnezia-client/commit/c2f443d444f6f46a0a855794aa983db1500371b5) feat: move amnezia hardcode from sources to cmake - [`89da125`](https://github.com/amnezia-vpn/amnezia-client/commit/89da1258223a2b9070436241f35583d9f8bd8f1b) refactor: remove prem v1 migration - [`4ba660b`](https://github.com/amnezia-vpn/amnezia-client/commit/4ba660b9f51d54239f3fb37d44cebf8a127ba547) chore: move more branding - [`6f38768`](https://github.com/amnezia-vpn/amnezia-client/commit/6f38768d931aa67b3718d653bb63bc30e53b209e) fix: use host-matching architecture for iOS simulator builds - [`0370efa`](https://github.com/amnezia-vpn/amnezia-client/commit/0370eface9b002bad9be77e0558575fbe1ecae60) fix: mark the branded media assets catalog as a bundle resource - [`995ae17`](https://github.com/amnezia-vpn/amnezia-client/commit/995ae17a278dd37e70eb065c812c13cc51d8fe45) fix: parametrize the Swift app-group identifier used by Log.swift - [`ed62914`](https://github.com/amnezia-vpn/amnezia-client/commit/ed629147f56a646db42a43c8a8b0b5ad8d9899ae) fix: use APPLICATION_NAME instead of hardcoded Amnezia in log line format - [`fc035bb`](https://github.com/amnezia-vpn/amnezia-client/commit/fc035bb8f1284f66f2c453546b69a3038b300f89) fix: restore branding fixes dropped by rebase, rename swiftInterop to swiftBridge - [`c946675`](https://github.com/amnezia-vpn/amnezia-client/commit/c9466757c538a553c521af254a6b2cc73d84e647) Merge branch 'dev' of github-amnezia:amnezia-vpn/amnezia-client into HEAD ### 📊 Changes **43 files changed** (+490 additions, -307 deletions) <details> <summary>View changed files</summary> 📝 `CMakeLists.txt` (+3 -1) 📝 `client/CMakeLists.txt` (+48 -13) 📝 `client/amneziaApplication.cpp` (+5 -4) ➕ `client/cmake/clientBrandingDefaults.cmake` (+118 -0) 📝 `client/cmake/ios-arch-fixup.cmake` (+12 -1) 📝 `client/cmake/ios.cmake` (+16 -15) 📝 `client/cmake/macos_ne.cmake` (+11 -10) 📝 `client/cmake/sources.cmake` (+2 -0) 📝 `client/core/controllers/api/subscriptionController.cpp` (+3 -2) 📝 `client/core/controllers/coreController.cpp` (+7 -6) 📝 `client/core/controllers/coreSignalHandlers.cpp` (+2 -2) 📝 `client/core/controllers/selfhosted/exportController.cpp` (+2 -1) 📝 `client/core/controllers/serversController.cpp` (+1 -1) 📝 `client/core/controllers/settingsController.cpp` (+0 -10) 📝 `client/core/controllers/settingsController.h` (+0 -3) 📝 `client/core/controllers/updateController.cpp` (+1 -0) 📝 `client/core/repositories/secureAppSettingsRepository.cpp` (+0 -10) 📝 `client/core/repositories/secureAppSettingsRepository.h` (+0 -2) 📝 `client/core/utils/api/apiUtils.cpp` (+0 -38) 📝 `client/core/utils/api/apiUtils.h` (+0 -1) _...and 23 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

bsakaguchi

2026-10-14 21:06:56 +00:00