Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

Author: laktyushin

.bazelrc

@@ -22,3 +22,9 @@ build --spawn_strategy=standalone
 build --strategy=SwiftCompile=standalone
 build --define RULES_SWIFT_BUILD_DUMMY_WORKER=1
 
+common:index_build --experimental_convenience_symlinks=ignore
+common:index_build --bes_backend= --bes_results_url=
+common:index_build --nolegacy_important_outputs
+common:index_build --show_result=0
+common:index_build --define=buildNumber=10000
+common:index_build --define=telegramVersion=12.2.2

.gitignore

@@ -74,3 +74,4 @@ buildServer.json
 Telegram.LSP.json
 **/.build/**
 spm-files
+.bsp/**

.gitmodules

@@ -35,3 +35,6 @@ url=../tgcalls.git
 [submodule "third-party/XcodeGen"]
 	path = third-party/XcodeGen
 	url = https://github.com/yonaskolb/XcodeGen.git
+[submodule "build-system/bazel-rules/sourcekit-bazel-bsp"]
+	path = build-system/bazel-rules/sourcekit-bazel-bsp
+url=https://github.com/ali-fareed/sourcekit-bazel-bsp.git

.sourcekit-lsp/config.json

@@ -0,0 +1,9 @@
+{
+  "backgroundIndexing": true,
+  "backgroundPreparationMode": "build",
+  "defaultWorkspaceType": "buildServer",
+  "logging": {
+    "level": "error",
+    "privacyLevel": "sensitive"
+  }
+}

.vscode/launch.json

@@ -1,44 +1,19 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
     "configurations": [
         {
-            "type": "swift",
-            "request": "launch",
-            "args": [],
-            "cwd": "${workspaceFolder:telegram-ios}",
             "name": "Debug Telegram",
-            "program": "${workspaceFolder:telegram-ios}/.build/debug/Telegram",
-            "preLaunchTask": "swift: Build Debug Telegram"
+            "type": "lldb-dap",
+            "request": "attach",
+            "preLaunchTask": "_launch_telegram",
+            "debuggerRoot": "${workspaceFolder}",
+            "attachCommands": [
+                "process connect connect://localhost:6667"
+            ],
+            "internalConsoleOptions": "openOnSessionStart",
+            "timeout": 1000
         },
-        {
-            "type": "swift",
-            "request": "launch",
-            "args": [],
-            "cwd": "${workspaceFolder:telegram-ios}",
-            "name": "Release Telegram",
-            "program": "${workspaceFolder:telegram-ios}/.build/release/Telegram",
-            "preLaunchTask": "swift: Build Release Telegram"
-        },
-        {
-            "type": "swift",
-            "request": "launch",
-            "args": [],
-            "cwd": "${workspaceFolder:telegram-ios}",
-            "name": "Debug telegram-ios",
-            "program": "${workspaceFolder:telegram-ios}/.build/debug/telegram-ios",
-            "preLaunchTask": "swift: Build Debug telegram-ios"
-        },
-        {
-            "type": "swift",
-            "request": "launch",
-            "args": [],
-            "cwd": "${workspaceFolder:telegram-ios}",
-            "name": "Release telegram-ios",
-            "program": "${workspaceFolder:telegram-ios}/.build/release/telegram-ios",
-            "preLaunchTask": "swift: Build Release telegram-ios"
-        }
-    ]
+    ],
+    "options": {
+        "console": "integratedTerminal",
+    }
 }

.vscode/tasks.json

@@ -1,6 +1,79 @@
 {
-    "version": "2.0.0",
-    "tasks": [
-    ]
-  }
-  
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Build Telegram",
+      "type": "shell",
+      "command": "${workspaceFolder}/build-input/bazel-8.3.1-darwin-arm64",
+      "args": [
+        "build",
+        "Telegram/Telegram",
+        "--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.2",
+        "--disk_cache=${HOME}/telegram-bazel-cache",
+        "-c",
+        "dbg",
+        "--ios_multi_cpus=sim_arm64",
+        "--watchos_cpus=arm64_32",
+        "--features=swift.enable_batch_mode"
+      ],
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "problemMatcher": [],
+      "runOptions": {
+        "instanceLimit": 1
+      }
+    },
+    // Hidden never-ending task that handles the launch / debugging bits for Cmd+Shift+D.
+    // The problemMatcher field defines when the task is effectively ready to be debugged
+    // by the attach task in launch.json.
+    {
+      "label": "_launch_telegram",
+      "type": "shell",
+      "command": "./scripts/launch_and_debug.sh",
+      "presentation": {
+        "reveal": "always"
+      },
+      "hide": true,
+      "isBackground": true,
+      "problemMatcher": [
+        {
+          "pattern": [
+            {
+              "regexp": "\\b\\B",
+              "file": 1,
+              "location": 2,
+              "message": 3
+            }
+          ],
+          "background": {
+            "activeOnStart": true,
+            "beginsPattern": "^.*Building....*",
+            "endsPattern": "^.*Listening to port 6667 for a connection from .*"
+          }
+        }
+      ],
+      "runOptions": {
+        "instanceLimit": 1
+      }
+    },
+    {
+      "label": "Stream SourceKitBazelBSP Logs",
+      "type": "shell",
+      "command": "log stream --process sourcekit-bazel-bsp --debug",
+      "problemMatcher": [],
+      "isBackground": false,
+      "presentation": {
+        "reveal": "always",
+        "panel": "dedicated"
+      }
+    }
+  ]
+}

BUILD.bazel

@@ -0,0 +1,15 @@
+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",
+    files_to_watch = [
+        "**/*.swift",
+    ],
+    index_flags = [
+        "config=index_build",
+    ],
+    targets = [
+        "//Telegram:Telegram",
+    ],
+)

MODULE.bazel

@@ -30,8 +30,8 @@ local_path_override(
 
 http_file(
     name = "cmake_tar_gz",
-    urls = ["https://github.com/Kitware/CMake/releases/download/v3.23.1/cmake-3.23.1-macos-universal.tar.gz"],
-    sha256 = "f794ed92ccb4e9b6619a77328f313497d7decf8fb7e047ba35a348b838e0e1e2",
+    urls = ["https://github.com/Kitware/CMake/releases/download/v4.1.2/cmake-4.1.2-macos-universal.tar.gz"],
+    sha256 = "3be85f5b999e327b1ac7d804cbc9acd767059e9f603c42ec2765f6ab68fbd367",
 )
 
 http_file(
@@ -62,3 +62,9 @@ local_path_override(
     module_name = "build_configuration",
     path = "./build-input/configuration-repository",
 )
+
+bazel_dep(name = "sourcekit_bazel_bsp", version = "0.3.0")
+local_path_override(
+    module_name = "sourcekit_bazel_bsp",
+    path = "build-system/bazel-rules/sourcekit-bazel-bsp",
+)

Telegram/BUILD

@@ -495,6 +495,7 @@ associated_domains_fragment = "" if telegram_bundle_id not in official_bundle_id
     <string>applinks:telegram.me</string>
     <string>applinks:t.me</string>
     <string>applinks:*.t.me</string>
+    <string>webcredentials:t.me</string>
 </array>
 """
 

build-system/Make/Make.py

@@ -40,7 +40,6 @@ def __init__(self, bazel, override_bazel_version, override_xcode_version, bazel_
         self.additional_args = None
         self.build_number = None
         self.configuration_args = None
-        self.configuration_path = None
         self.split_submodules = False
         self.custom_target = None
         self.continue_on_error = False
@@ -68,7 +67,7 @@ def __init__(self, bazel, override_bazel_version, override_xcode_version, bazel_
             '--verbose_failures',
 
             # Asynchronously upload cache artifacts
-            '--experimental_remote_cache_async',
+            '--remote_cache_async',
         ]
 
         self.common_build_args = [
@@ -89,12 +88,6 @@ def __init__(self, bazel, override_bazel_version, override_xcode_version, bazel_
             # invoking a smaller number of frontend processes and passing them batches of
             # source files.
             '--features=swift.enable_batch_mode',
-
-            # https://docs.bazel.build/versions/master/command-line-reference.html
-            # Set the number of parallel jobs per module to saturate the available CPU resources.
-            #'--swiftcopt=-j{}'.format(os.cpu_count() - 1),
-            '--@build_bazel_rules_swift//swift:copt="-j{}"'.format(os.cpu_count() - 1),
-            '--@build_bazel_rules_swift//swift:copt="-whole-module-optimization"',
         ]
 
         self.common_release_args = [
@@ -147,9 +140,6 @@ def set_enable_sandbox(self, enable_sandbox):
     def set_split_swiftmodules(self, value):
         self.split_submodules = value
 
-    def set_configuration_path(self, path):
-        self.configuration_path = path
-
     def set_disable_provisioning_profiles(self):
         self.disable_provisioning_profiles = True
 
@@ -203,8 +193,6 @@ def set_configuration(self, configuration):
 
                 # Require DSYM files as build output.
                 '--output_groups=+dsyms',
-
-                #'--@build_bazel_rules_swift//swift:copt="-num-threads 0"',
             ] + self.common_release_args
         else:
             raise Exception('Unknown configuration {}'.format(configuration))
@@ -296,13 +284,6 @@ def invoke_build(self):
         if self.disable_provisioning_profiles:
             combined_arguments += ['--//Telegram:disableProvisioningProfiles']
 
-        if self.configuration_path is None:
-            raise Exception('configuration_path is not defined')
-
-        combined_arguments += [
-            '--override_repository=build_configuration={}'.format(self.configuration_path)
-        ]
-
         combined_arguments += self.common_args
         combined_arguments += self.common_build_args
         combined_arguments += self.get_define_arguments()
@@ -336,13 +317,6 @@ def invoke_test(self):
 
         combined_arguments += ['Tests/AllTests']
 
-        if self.configuration_path is None:
-            raise Exception('configuration_path is not defined')
-
-        combined_arguments += [
-            '--override_repository=build_configuration={}'.format(self.configuration_path)
-        ]
-
         combined_arguments += self.common_args
         combined_arguments += self.common_build_args
         combined_arguments += self.get_define_arguments()
@@ -371,13 +345,6 @@ def invoke_query(self, query_args):
         combined_arguments += self.get_startup_bazel_arguments()
         combined_arguments += ['aquery']
 
-        if self.configuration_path is None:
-            raise Exception('configuration_path is not defined')
-
-        combined_arguments += [
-            '--override_repository=build_configuration={}'.format(self.configuration_path)
-        ]
-
         combined_arguments += [
             '-c', 'dbg',
             '--ios_multi_cpus=sim_arm64',
@@ -425,13 +392,6 @@ def get_spm_aspect_invocation(self):
         if self.disable_provisioning_profiles:
             combined_arguments += ['--//Telegram:disableProvisioningProfiles']
 
-        if self.configuration_path is None:
-            raise Exception('configuration_path is not defined')
-
-        combined_arguments += [
-            '--override_repository=build_configuration={}'.format(self.configuration_path)
-        ]
-
         combined_arguments += self.common_args
         combined_arguments += self.common_build_args
         combined_arguments += self.get_define_arguments()
@@ -562,9 +522,6 @@ def resolve_configuration(base_path, bazel_command_line: BazelCommandLine, argum
             file.write('    "{}",\n'.format(file_name))
         file.write('])\n')
 
-    if bazel_command_line is not None:
-        bazel_command_line.set_configuration_path(configuration_repository_path)
-
 
 def generate_project(bazel, arguments):
     bazel_command_line = BazelCommandLine(
@@ -617,7 +574,6 @@ def generate_project(bazel, arguments):
         disable_provisioning_profiles=disable_provisioning_profiles,
         include_release=project_include_release,
         generate_dsym=generate_dsym,
-        configuration_path=bazel_command_line.configuration_path,
         bazel_app_arguments=bazel_command_line.get_project_generation_arguments(),
         target_name=target_name
     )
@@ -1006,14 +962,10 @@ def add_project_and_build_common_arguments(current_parser: argparse.ArgumentPars
     buildParser.add_argument(
         '--configuration',
         choices=[
-            'debug_universal',
             'debug_arm64',
-            'debug_armv7',
             'debug_sim_arm64',
             'release_sim_arm64',
             'release_arm64',
-            'release_armv7',
-            'release_universal'
         ],
         required=True,
         help='Build configuration'
@@ -1254,14 +1206,10 @@ def add_project_and_build_common_arguments(current_parser: argparse.ArgumentPars
     spm_parser.add_argument(
         '--configuration',
         choices=[
-            'debug_universal',
             'debug_arm64',
-            'debug_armv7',
             'debug_sim_arm64',
             'release_sim_arm64',
             'release_arm64',
-            'release_armv7',
-            'release_universal'
         ],
         required=True,
         help='Build configuration'