From dd8040f00c3015153ae241191158c5581ec2ffad Mon Sep 17 00:00:00 2001 From: Isaac <> Date: Sat, 22 Nov 2025 03:17:01 +0800 Subject: [PATCH] Update build system --- .vscode/launch.json | 12 ++++++++++++ .vscode/tasks.json | 24 +++++++++++++++++++++++- BUILD.bazel | 2 +- MODULE.bazel.lock | 4 ++-- scripts/launch_and_debug.sh | 2 +- versions.json | 2 +- 6 files changed, 40 insertions(+), 6 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index b8a02ce9f7..8ca4257fe3 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -12,6 +12,18 @@ "internalConsoleOptions": "openOnSessionStart", "timeout": 1000 }, + { + "name": "Restart Debug Telegram", + "type": "lldb-dap", + "request": "attach", + "preLaunchTask": "Restart Telegram Debug", + "debuggerRoot": "${workspaceFolder}", + "attachCommands": [ + "process connect connect://localhost:6667" + ], + "internalConsoleOptions": "openOnSessionStart", + "timeout": 1000 + }, ], "options": { "console": "integratedTerminal", diff --git a/.vscode/tasks.json b/.vscode/tasks.json index b2656a5f75..efabdea411 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -4,7 +4,7 @@ { "label": "Build Telegram", "type": "shell", - "command": "${workspaceFolder}/build-input/bazel-8.3.1-darwin-arm64", + "command": "${workspaceFolder}/build-input/bazel-8.4.2-darwin-arm64", "args": [ "build", "Telegram/Telegram", @@ -74,6 +74,28 @@ "reveal": "always", "panel": "dedicated" } + }, + { + "label": "Stop Telegram Debug Session", + "type": "shell", + "command": "pkill -f 'launch_and_debug.sh' || true; lsof -ti:6667 | xargs kill -9 2>/dev/null || true", + "problemMatcher": [], + "presentation": { + "reveal": "silent", + "close": true + } + }, + { + "label": "Restart Telegram Debug", + "dependsOrder": "sequence", + "dependsOn": [ + "Stop Telegram Debug Session", + "_launch_telegram" + ], + "problemMatcher": [], + "presentation": { + "reveal": "always" + } } ] } \ No newline at end of file diff --git a/BUILD.bazel b/BUILD.bazel index 51cc4ab4ac..37688a7cca 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -2,7 +2,7 @@ load("@sourcekit_bazel_bsp//rules:setup_sourcekit_bsp.bzl", "setup_sourcekit_bsp setup_sourcekit_bsp( name = "setup_sourcekit_bsp_telegram_project", - bazel_wrapper = "./build-input/bazel-8.3.1-darwin-arm64", + bazel_wrapper = "./build-input/bazel-8.4.2-darwin-arm64", files_to_watch = [ "**/*.swift", ], diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 6e376e79fa..a158c62a2c 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -256,7 +256,7 @@ }, "@@rules_xcodeproj+//xcodeproj:extensions.bzl%internal": { "general": { - "bzlTransitiveDigest": "/r7IWMTdpceHqqiSh7G9bQLHvIkfqE/cesswbkTSJZw=", + "bzlTransitiveDigest": "hsJI1bzu5CX3ZE+NX8jnNWEOh1pNDT650SbTSBnF5jA=", "usagesDigest": "fvsnMonVwKDYnBfww4bXuYie3WU0d9VSqT2gePSdQco=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -278,7 +278,7 @@ }, "@@rules_xcodeproj+//xcodeproj:extensions.bzl%non_module_deps": { "general": { - "bzlTransitiveDigest": "/r7IWMTdpceHqqiSh7G9bQLHvIkfqE/cesswbkTSJZw=", + "bzlTransitiveDigest": "hsJI1bzu5CX3ZE+NX8jnNWEOh1pNDT650SbTSBnF5jA=", "usagesDigest": "jzxYhnOC9BE0dJ0biFLfxWXi/+R19uAAZkJ0p9CY0JI=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, diff --git a/scripts/launch_and_debug.sh b/scripts/launch_and_debug.sh index 089422a5cf..401c299fd4 100755 --- a/scripts/launch_and_debug.sh +++ b/scripts/launch_and_debug.sh @@ -7,7 +7,7 @@ set -e # Ideally we should upstream these changes back to rules_apple since they should be useful for everyone. echo "Building..." -./build-input/bazel-8.3.1-darwin-arm64 build Telegram/Telegram --announce_rc --features=swift.use_global_module_cache --verbose_failures --remote_cache_async --features=swift.skip_function_bodies_for_derived_files --jobs=16 --define=buildNumber=10000 --define=telegramVersion=12.2.1 --disk_cache=/Users/ali/telegram-bazel-cache -c dbg --ios_multi_cpus=sim_arm64 --watchos_cpus=arm64_32 --features=swift.enable_batch_mode +./build-input/bazel-8.4.2-darwin-arm64 build Telegram/Telegram --announce_rc --features=swift.use_global_module_cache --verbose_failures --remote_cache_async --jobs=16 --define=buildNumber=10000 --define=telegramVersion=12.2.1 --disk_cache=/Users/ali/telegram-bazel-cache -c dbg --ios_multi_cpus=sim_arm64 --watchos_cpus=arm64_32 --features=swift.enable_batch_mode chmod -R 777 ./bazel-bin/Telegram tmp_file=$(pwd)/bazel-bin/Telegram/pid.txt diff --git a/versions.json b/versions.json index c8c96cb539..100c66578d 100644 --- a/versions.json +++ b/versions.json @@ -1,6 +1,6 @@ { "app": "12.2.2", "xcode": "26.0", - "bazel": "8.3.1:0cac3a67dc5429c68272dc6944104952e9e4cf84b29d126a5ff3fbaa59045217", + "bazel": "8.4.2:45e9388abf21d1107e146ea366ad080eb93cb6a5f3a4a3b048f78de0bc3faffa", "macos": "26" }