Skip to content

Commit a1ce5e5

Browse files
author
Isaac
committed
Merge branch 'master' into beta
# Conflicts: # Telegram/Telegram-iOS/en.lproj/Localizable.strings # versions.json
2 parents e5762bd + 92065b2 commit a1ce5e5

File tree

500 files changed

+21813
-9295
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

500 files changed

+21813
-9295
lines changed

.bazelrc

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,11 @@ build --apple_crosstool_top=@local_config_apple_cc//:toolchain
66
build --crosstool_top=@local_config_apple_cc//:toolchain
77
build --host_crosstool_top=@local_config_apple_cc//:toolchain
88

9-
build --cxxopt='-std=c++17'
10-
build --per_file_copt="third-party/webrtc/.*\.cpp$","@-std=c++17"
11-
build --per_file_copt="third-party/webrtc/.*\.cc$","@-std=c++17"
12-
build --per_file_copt="third-party/webrtc/.*\.mm$","@-std=c++17"
13-
build --per_file_copt="submodules/LottieMeshSwift/LottieMeshBinding/Sources/.*\.mm$","@-std=c++17"
14-
build --per_file_copt="submodules/LottieCpp/lottiecpp/Sources/.*\.mm$","@-std=c++17"
15-
build --per_file_copt="submodules/LottieCpp/lottiecpp/Sources/.*\.cpp$","@-std=c++17"
16-
build --per_file_copt="submodules/LottieCpp/lottiecpp/PlatformSpecific/Darwin/Sources/.*\.mm$","@-std=c++17"
17-
build --per_file_copt="submodules/LottieCpp/lottiecpp/PlatformSpecific/Darwin/Sources/.*\.cpp$","@-std=c++17"
18-
build --per_file_copt="Tests/LottieMetalTest/SoftwareLottieRenderer/Sources/.*\.cpp$","@-std=c++17"
19-
build --per_file_copt="Tests/LottieMetalTest/SoftwareLottieRenderer/Sources/.*\.mm$","@-std=c++17"
20-
build --per_file_copt="third-party/td/TdBinding/Sources/.*\.mm$","@-std=c++17"
21-
22-
build --swiftcopt=-whole-module-optimization
9+
#build --swiftcopt=-whole-module-optimization
2310

2411
build --per_file_copt=".*\.m$","@-fno-objc-msgsend-selector-stubs"
2512
build --per_file_copt=".*\.mm$","@-fno-objc-msgsend-selector-stubs"
2613

27-
#build --linkopt="-ld_classic"
28-
2914
build --features=debug_prefix_map_pwd_is_dot
3015
build --features=swift.cacheable_swiftmodules
3116
build --features=swift.debug_prefix_map
@@ -37,4 +22,3 @@ build --spawn_strategy=standalone
3722
build --strategy=SwiftCompile=standalone
3823
build --define RULES_SWIFT_BUILD_DUMMY_WORKER=1
3924

40-
build --noenable_bzlmod

.vscode/settings.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,5 @@
1313
".git/**": true
1414
},
1515
"files.associations": {
16-
"memory": "cpp"
1716
}
1817
}

MODULE.bazel

Lines changed: 64 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,64 @@
1-
###############################################################################
2-
# Bazel now uses Bzlmod by default to manage external dependencies.
3-
# Please consider migrating your external dependencies from WORKSPACE to MODULE.bazel.
4-
#
5-
# For more details, please check https://github.com/bazelbuild/bazel/issues/18958
6-
###############################################################################
1+
http_file = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
2+
3+
bazel_dep(name = "bazel_features", version = "1.29.0")
4+
bazel_dep(name = "bazel_skylib", version = "1.7.1")
5+
bazel_dep(name = "platforms", version = "0.0.11")
6+
7+
bazel_dep(name = "rules_xcodeproj")
8+
local_path_override(
9+
module_name = "rules_xcodeproj",
10+
path = "./build-system/bazel-rules/rules_xcodeproj",
11+
)
12+
13+
bazel_dep(name = "rules_apple", repo_name = "build_bazel_rules_apple")
14+
local_path_override(
15+
module_name = "rules_apple",
16+
path = "./build-system/bazel-rules/rules_apple",
17+
)
18+
19+
bazel_dep(name = "rules_swift", repo_name = "build_bazel_rules_swift")
20+
local_path_override(
21+
module_name = "rules_swift",
22+
path = "./build-system/bazel-rules/rules_swift",
23+
)
24+
25+
bazel_dep(name = "apple_support", repo_name = "build_bazel_apple_support")
26+
local_path_override(
27+
module_name = "apple_support",
28+
path = "./build-system/bazel-rules/apple_support",
29+
)
30+
31+
http_file(
32+
name = "cmake_tar_gz",
33+
urls = ["https://github.com/Kitware/CMake/releases/download/v3.23.1/cmake-3.23.1-macos-universal.tar.gz"],
34+
sha256 = "f794ed92ccb4e9b6619a77328f313497d7decf8fb7e047ba35a348b838e0e1e2",
35+
)
36+
37+
http_file(
38+
name = "meson_tar_gz",
39+
urls = ["https://github.com/mesonbuild/meson/releases/download/1.6.0/meson-1.6.0.tar.gz"],
40+
sha256 = "999b65f21c03541cf11365489c1fad22e2418bb0c3d50ca61139f2eec09d5496",
41+
)
42+
43+
http_file(
44+
name = "ninja-mac_zip",
45+
urls = ["https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-mac.zip"],
46+
sha256 = "89a287444b5b3e98f88a945afa50ce937b8ffd1dcc59c555ad9b1baf855298c9",
47+
)
48+
49+
http_file(
50+
name = "flatbuffers_zip",
51+
urls = ["https://github.com/google/flatbuffers/archive/refs/tags/v24.12.23.zip"],
52+
sha256 = "c5cd6a605ff20350c7faa19d8eeb599df6117ea4aabd16ac58a7eb5ba82df4e7",
53+
)
54+
55+
provisioning_profile_repository = use_extension("@build_bazel_rules_apple//apple:apple.bzl", "provisioning_profile_repository_extension")
56+
#provisioning_profile_repository.setup(
57+
# fallback_profiles = "//path/to/some:filegroup", # Profiles to use if one isn't found locally
58+
#)
59+
60+
bazel_dep(name = "build_configuration")
61+
local_path_override(
62+
module_name = "build_configuration",
63+
path = "./build-input/configuration-repository",
64+
)

0 commit comments

Comments
 (0)