[WIP] Bazel transition

Makefile

@@ -62,6 +62,13 @@ BAZEL_DEBUG_FLAGS=\
 BAZEL_OPT_FLAGS=\
 	--swiftcopt=-whole-module-optimization \
 	--swiftcopt='-num-threads' --swiftcopt='16' \
+    --objc_enable_binary_stripping \
+    --strip=always \
+    --stripopt -S \
+    --stripopt -T \
+    --stripopt -X \
+    --stripopt -p \
+    -s \
 
 
 build_arm64: check_env

Telegram/BUILD

@@ -507,6 +507,344 @@ swift_library(
     ],
 )
 
+plist_fragment(
+    name = "MtProtoKitInfoPlist",
+    extension = "plist",
+    template =
+    """
+    <key>CFBundleIdentifier</key>
+    <string>{telegram_bundle_id}.MtProtoKit</string>
+    <key>CFBundleVersion</key>
+    <string>{telegram_build_number}</string>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleName</key>
+    <string>MtProtoKit</string>
+    <key>CFBundleShortVersionString</key>
+    <string>{telegram_version}</string>
+    """.format(
+        telegram_bundle_id = telegram_bundle_id,
+        telegram_version = telegram_version,
+        telegram_build_number = telegram_build_number,
+    )
+)
+
+ios_framework(
+    name = "MtProtoKitFramework",
+    bundle_id = "{telegram_bundle_id}.MtProtoKit".format(
+        telegram_bundle_id = telegram_bundle_id,
+    ),
+    families = [
+        "iphone",
+        "ipad",
+    ],
+    infoplists = [
+        ":MtProtoKitInfoPlist",
+    ],
+    minimum_os_version = "9.0",
+    deps = [
+        "//submodules/MtProtoKit:MtProtoKit",
+    ],
+)
+
+plist_fragment(
+    name = "SwiftSignalKitInfoPlist",
+    extension = "plist",
+    template =
+    """
+    <key>CFBundleIdentifier</key>
+    <string>{telegram_bundle_id}.SwiftSignalKit</string>
+    <key>CFBundleVersion</key>
+    <string>{telegram_build_number}</string>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleName</key>
+    <string>SwiftSignalKit</string>
+    <key>CFBundleShortVersionString</key>
+    <string>{telegram_version}</string>
+    """.format(
+        telegram_bundle_id = telegram_bundle_id,
+        telegram_version = telegram_version,
+        telegram_build_number = telegram_build_number,
+    )
+)
+
+ios_framework(
+    name = "SwiftSignalKitFramework",
+    bundle_id = "{telegram_bundle_id}.SwiftSignalKit".format(
+        telegram_bundle_id = telegram_bundle_id,
+    ),
+    families = [
+        "iphone",
+        "ipad",
+    ],
+    infoplists = [
+        ":SwiftSignalKitInfoPlist",
+    ],
+    minimum_os_version = "9.0",
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+    ],
+)
+
+plist_fragment(
+    name = "PostboxInfoPlist",
+    extension = "plist",
+    template =
+    """
+    <key>CFBundleIdentifier</key>
+    <string>{telegram_bundle_id}.Postbox</string>
+    <key>CFBundleVersion</key>
+    <string>{telegram_build_number}</string>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleName</key>
+    <string>Postbox</string>
+    <key>CFBundleShortVersionString</key>
+    <string>{telegram_version}</string>
+    """.format(
+        telegram_bundle_id = telegram_bundle_id,
+        telegram_version = telegram_version,
+        telegram_build_number = telegram_build_number,
+    )
+)
+
+ios_framework(
+    name = "PostboxFramework",
+    bundle_id = "{telegram_bundle_id}.Postbox".format(
+        telegram_bundle_id = telegram_bundle_id,
+    ),
+    families = [
+        "iphone",
+        "ipad",
+    ],
+    infoplists = [
+        ":PostboxInfoPlist",
+    ],
+    frameworks = [
+        ":SwiftSignalKitFramework",
+    ],
+    minimum_os_version = "9.0",
+    deps = [
+        "//submodules/Postbox:Postbox",
+    ],
+)
+
+plist_fragment(
+    name = "TelegramApiInfoPlist",
+    extension = "plist",
+    template =
+    """
+    <key>CFBundleIdentifier</key>
+    <string>{telegram_bundle_id}.TelegramApi</string>
+    <key>CFBundleVersion</key>
+    <string>{telegram_build_number}</string>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleName</key>
+    <string>TelegramApi</string>
+    <key>CFBundleShortVersionString</key>
+    <string>{telegram_version}</string>
+    """.format(
+        telegram_bundle_id = telegram_bundle_id,
+        telegram_version = telegram_version,
+        telegram_build_number = telegram_build_number,
+    )
+)
+
+ios_framework(
+    name = "TelegramApiFramework",
+    bundle_id = "{telegram_bundle_id}.TelegramApi".format(
+        telegram_bundle_id = telegram_bundle_id,
+    ),
+    families = [
+        "iphone",
+        "ipad",
+    ],
+    infoplists = [
+        ":TelegramApiInfoPlist",
+    ],
+    minimum_os_version = "9.0",
+    deps = [
+        "//submodules/TelegramApi:TelegramApi",
+    ],
+)
+
+plist_fragment(
+    name = "SyncCoreInfoPlist",
+    extension = "plist",
+    template =
+    """
+    <key>CFBundleIdentifier</key>
+    <string>{telegram_bundle_id}.SyncCore</string>
+    <key>CFBundleVersion</key>
+    <string>{telegram_build_number}</string>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleName</key>
+    <string>SyncCore</string>
+    <key>CFBundleShortVersionString</key>
+    <string>{telegram_version}</string>
+    """.format(
+        telegram_bundle_id = telegram_bundle_id,
+        telegram_version = telegram_version,
+        telegram_build_number = telegram_build_number,
+    )
+)
+
+ios_framework(
+    name = "SyncCoreFramework",
+    bundle_id = "{telegram_bundle_id}.SyncCore".format(
+        telegram_bundle_id = telegram_bundle_id,
+    ),
+    families = [
+        "iphone",
+        "ipad",
+    ],
+    infoplists = [
+        ":SyncCoreInfoPlist",
+    ],
+    frameworks = [
+        ":SwiftSignalKitFramework",
+        ":PostboxFramework",
+    ],
+    minimum_os_version = "9.0",
+    deps = [
+        "//submodules/SyncCore:SyncCore",
+    ],
+)
+
+plist_fragment(
+    name = "TelegramCoreInfoPlist",
+    extension = "plist",
+    template =
+    """
+    <key>CFBundleIdentifier</key>
+    <string>{telegram_bundle_id}.TelegramCore</string>
+    <key>CFBundleVersion</key>
+    <string>{telegram_build_number}</string>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleName</key>
+    <string>TelegramCore</string>
+    <key>CFBundleShortVersionString</key>
+    <string>{telegram_version}</string>
+    """.format(
+        telegram_bundle_id = telegram_bundle_id,
+        telegram_version = telegram_version,
+        telegram_build_number = telegram_build_number,
+    )
+)
+
+ios_framework(
+    name = "TelegramCoreFramework",
+    bundle_id = "{telegram_bundle_id}.TelegramCore".format(
+        telegram_bundle_id = telegram_bundle_id,
+    ),
+    families = [
+        "iphone",
+        "ipad",
+    ],
+    infoplists = [
+        ":TelegramCoreInfoPlist",
+    ],
+    frameworks = [
+        ":MtProtoKitFramework",
+        ":SwiftSignalKitFramework",
+        ":PostboxFramework",
+        ":SyncCoreFramework",
+        ":TelegramApiFramework",
+    ],
+    minimum_os_version = "9.0",
+    deps = [
+        "//submodules/TelegramCore:TelegramCore",
+    ],
+)
+
+plist_fragment(
+    name = "AsyncDisplayKitInfoPlist",
+    extension = "plist",
+    template =
+    """
+    <key>CFBundleIdentifier</key>
+    <string>{telegram_bundle_id}.AsyncDisplayKit</string>
+    <key>CFBundleVersion</key>
+    <string>{telegram_build_number}</string>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleName</key>
+    <string>AsyncDisplayKit</string>
+    <key>CFBundleShortVersionString</key>
+    <string>{telegram_version}</string>
+    """.format(
+        telegram_bundle_id = telegram_bundle_id,
+        telegram_version = telegram_version,
+        telegram_build_number = telegram_build_number,
+    )
+)
+
+ios_framework(
+    name = "AsyncDisplayKitFramework",
+    bundle_id = "{telegram_bundle_id}.AsyncDisplayKit".format(
+        telegram_bundle_id = telegram_bundle_id,
+    ),
+    families = [
+        "iphone",
+        "ipad",
+    ],
+    infoplists = [
+        ":AsyncDisplayKitInfoPlist",
+    ],
+    minimum_os_version = "9.0",
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+    ],
+)
+
+plist_fragment(
+    name = "DisplayInfoPlist",
+    extension = "plist",
+    template =
+    """
+    <key>CFBundleIdentifier</key>
+    <string>{telegram_bundle_id}.Display</string>
+    <key>CFBundleVersion</key>
+    <string>{telegram_build_number}</string>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleName</key>
+    <string>Display</string>
+    <key>CFBundleShortVersionString</key>
+    <string>{telegram_version}</string>
+    """.format(
+        telegram_bundle_id = telegram_bundle_id,
+        telegram_version = telegram_version,
+        telegram_build_number = telegram_build_number,
+    )
+)
+
+ios_framework(
+    name = "DisplayFramework",
+    bundle_id = "{telegram_bundle_id}.Display".format(
+        telegram_bundle_id = telegram_bundle_id,
+    ),
+    families = [
+        "iphone",
+        "ipad",
+    ],
+    infoplists = [
+        ":DisplayInfoPlist",
+    ],
+    frameworks = [
+        ":SwiftSignalKitFramework",
+        ":AsyncDisplayKitFramework",
+    ],
+    minimum_os_version = "9.0",
+    deps = [
+        "//submodules/Display:Display",
+    ],
+)
+
 plist_fragment(
     name = "TelegramUIInfoPlist",
     extension = "plist",
@@ -541,6 +879,16 @@ ios_framework(
     infoplists = [
         ":TelegramUIInfoPlist",
     ],
+    frameworks = [
+        ":MtProtoKitFramework",
+        ":SwiftSignalKitFramework",
+        ":PostboxFramework",
+        ":TelegramApiFramework",
+        ":SyncCoreFramework",
+        ":TelegramCoreFramework",
+        ":AsyncDisplayKitFramework",
+        ":DisplayFramework",
+    ],
     minimum_os_version = "9.0",
     deps = [
         "//submodules/TelegramUI:TelegramUI",
@@ -858,6 +1206,14 @@ ios_application(
         ":DefaultAppIcon",
     ],
     frameworks = [
+        ":MtProtoKitFramework",
+        ":SwiftSignalKitFramework",
+        ":PostboxFramework",
+        ":TelegramApiFramework",
+        ":SyncCoreFramework",
+        ":TelegramCoreFramework",
+        ":AsyncDisplayKitFramework",
+        ":DisplayFramework",
         ":TelegramUIFramework",
     ],
     strings = [

Telegram/Telegram-iOS/en.lproj/Localizable.strings

@@ -4360,6 +4360,7 @@ Sorry for the inconvenience.";
 "Channel.DiscussionGroup.HeaderLabel" = "Discuss";
 "Channel.DiscussionGroup.Create" = "Create New Group";
 "Channel.DiscussionGroup.PrivateGroup" = "private group";
+"Channel.DiscussionGroup.PrivateChannel" = "private channel";
 "Channel.DiscussionGroup.Info" = "Everything you post in the channel will be forwarded to this group.";
 "Channel.DiscussionGroup.LinkGroup" = "Link Group";
 "Channel.DiscussionGroup.UnlinkGroup" = "Unlink Group";

submodules/Crc32/BUILD

@@ -16,6 +16,9 @@ objc_library(
     sdk_frameworks = [
         "Foundation",
     ],
+    sdk_dylibs = [
+        "libz",
+    ],
     visibility = [
         "//visibility:public",
     ],

submodules/Display/BUILD

@@ -14,6 +14,7 @@ swift_library(
         "//submodules/Markdown:Markdown",
         "//submodules/AsyncDisplayKit:AsyncDisplayKit",
     ],
+    alwayslink = True,
     visibility = [
         "//visibility:public",
     ],

submodules/MtProtoKit/BUILD

@@ -20,6 +20,10 @@ objc_library(
         "Foundation",
         "Security",
         "SystemConfiguration",
+        "CFNetwork",
+    ],
+    sdk_dylibs = [
+        "libz",
     ],
     visibility = [
         "//visibility:public",

submodules/PeerInfoUI/Sources/ChannelDiscussionGroupSetupController.swift

@@ -152,8 +152,10 @@ private enum ChannelDiscussionGroupSetupControllerEntry: ItemListNodeEntry {
                 let text: String
                 if let peer = peer as? TelegramChannel, let addressName = peer.addressName, !addressName.isEmpty {
                     text = "@\(addressName)"
-                } else {
+                } else if let peer = peer as? TelegramChannel, case .group = peer.info {
                     text = strings.Channel_DiscussionGroup_PrivateGroup
+                } else {
+                    text = strings.Channel_DiscussionGroup_PrivateChannel
                 }
                 return ItemListPeerItem(presentationData: presentationData, dateTimeFormat: PresentationDateTimeFormat(timeFormat: .regular, dateFormat: .monthFirst, dateSeparator: ".", decimalSeparator: ".", groupingSeparator: "."), nameDisplayOrder: nameOrder, context: arguments.context, peer: peer, aliasHandling: .standard, nameStyle: .plain, presence: nil, text: .text(text), label: .none, editing: ItemListPeerItemEditing(editable: false, editing: false, revealed: false), revealOptions: nil, switchValue: nil, enabled: true, selectable: true, sectionId: self.section, action: {
                     arguments.selectGroup(peer.id)

submodules/TelegramCore/BUILD

@@ -18,6 +18,7 @@ swift_library(
         "//submodules/NetworkLogging:NetworkLogging",
         "//submodules/Reachability:Reachability",
     ],
+    alwayslink = True,
     visibility = [
         "//visibility:public",
     ],

submodules/WalletUI/Sources/WalletStrings.swift

@@ -449,12 +449,12 @@ public final class WalletStrings: Equatable {
     public var Wallet_Send_ConfirmationConfirm: String { return self._s[218]! }
     public var Wallet_Created_ExportErrorTitle: String { return self._s[219]! }
     public var Wallet_Info_TransactionPendingHeader: String { return self._s[220]! }
-    public func Wallet_Updated_MinutesAgo(_ value: Int32) -> String {
+    public func Wallet_Updated_HoursAgo(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = walletStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[0 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func Wallet_Updated_HoursAgo(_ value: Int32) -> String {
+    public func Wallet_Updated_MinutesAgo(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = walletStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[1 * 6 + Int(form.rawValue)]!, stringValue)

third-party/webrtc/BUILD

@@ -1,4 +1,4 @@
-use_gn_build = False
+use_gn_build = True
 
 webrtc_libs = [
     "libwebrtc.a",