Merge branch 'beta'

Makefile

@@ -59,6 +59,7 @@ BAZEL_COMMON_FLAGS=\
 	--features=swift.use_global_module_cache \
 	--features=swift.split_derived_files_generation \
 	--features=swift.skip_function_bodies_for_derived_files \
+	--apple_bitcode=watchos=embedded \
 	--jobs=${CORE_COUNT}
 	
 BAZEL_DEBUG_FLAGS=\
@@ -72,6 +73,7 @@ BAZEL_OPT_FLAGS=\
 	--features=swift.opt_uses_wmo \
 	--features=swift.opt_uses_osize \
 	--swiftcopt='-num-threads' --swiftcopt='0' \
+	--features=dead_strip \
     --objc_enable_binary_stripping \
 
 
@@ -412,8 +414,6 @@ bazel_app_arm64:
 	-c opt \
 	--ios_multi_cpus=arm64 \
 	--watchos_cpus=armv7k,arm64_32 \
-	--objc_enable_binary_stripping=true \
-	--features=dead_strip \
 	--apple_generate_dsym \
 	--output_groups=+dsyms \
 	--verbose_failures
@@ -427,8 +427,6 @@ bazel_app_armv7:
 	-c opt \
 	--ios_multi_cpus=armv7 \
 	--watchos_cpus=armv7k,arm64_32 \
-	--objc_enable_binary_stripping=true \
-	--features=dead_strip \
 	--apple_generate_dsym \
 	--output_groups=+dsyms \
 	--verbose_failures
@@ -442,8 +440,6 @@ bazel_app:
 	-c opt \
 	--ios_multi_cpus=armv7,arm64 \
 	--watchos_cpus=armv7k,arm64_32 \
-	--objc_enable_binary_stripping=true \
-	--features=dead_strip \
 	--apple_generate_dsym \
 	--output_groups=+dsyms \
 	--verbose_failures

Telegram/BUILD

@@ -130,6 +130,13 @@ filegroup(
     ], exclude = ["Telegram-iOS/DefaultAppIcon.xcassets/**/.*"]),
 )
 
+filegroup(
+    name = "BlackAppIcon",
+    srcs = glob([
+        "Telegram-iOS/BlackIcon.xcassets/**/*",
+    ], exclude = ["Telegram-iOS/BlackIcon.xcassets/**/.*"]),
+)
+
 filegroup(
     name = "DefaultIcon",
     srcs = glob([
@@ -244,7 +251,7 @@ official_bundle_ids = [
     "org.telegram.Telegram-iOS",
 ]
 
-apple_pay_merchants = official_apple_pay_merchants if telegram_bundle_id == "ph.telegra.Telegraph" else ""
+apple_pay_merchants = []#official_apple_pay_merchants if telegram_bundle_id == "ph.telegra.Telegraph" else ""
 
 apple_pay_merchants_fragment = "" if apple_pay_merchants == "" else """
 <key>com.apple.developer.in-app-payments</key>
@@ -286,6 +293,8 @@ telegram_entitlements_template = """
     </array>
     <key>application-identifier</key>
     <string>{telegram_team_id}.{telegram_bundle_id}</string>
+    <key>com.apple.developer.icloud-container-environment</key>
+    <string>Production</string>
 """ + apple_pay_merchants_fragment + unrestricted_voip_fragment
 
 plist_fragment(
@@ -451,6 +460,8 @@ plist_fragment(
     </array>
     <key>WKWatchKitApp</key>
     <true/>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
     """.format(
         telegram_bundle_id = telegram_bundle_id,
     )
@@ -523,6 +534,8 @@ plist_fragment(
     <string>MtProtoKit</string>
     <key>CFBundleShortVersionString</key>
     <string>{telegram_version}</string>
+    <key>CFBundlePackageType</key>
+    <string>FMWK</string>
     """.format(
         telegram_bundle_id = telegram_bundle_id,
         telegram_version = telegram_version,
@@ -564,6 +577,8 @@ plist_fragment(
     <string>SwiftSignalKit</string>
     <key>CFBundleShortVersionString</key>
     <string>{telegram_version}</string>
+    <key>CFBundlePackageType</key>
+    <string>FMWK</string>
     """.format(
         telegram_bundle_id = telegram_bundle_id,
         telegram_version = telegram_version,
@@ -605,6 +620,8 @@ plist_fragment(
     <string>Postbox</string>
     <key>CFBundleShortVersionString</key>
     <string>{telegram_version}</string>
+    <key>CFBundlePackageType</key>
+    <string>FMWK</string>
     """.format(
         telegram_bundle_id = telegram_bundle_id,
         telegram_version = telegram_version,
@@ -649,6 +666,8 @@ plist_fragment(
     <string>TelegramApi</string>
     <key>CFBundleShortVersionString</key>
     <string>{telegram_version}</string>
+    <key>CFBundlePackageType</key>
+    <string>FMWK</string>
     """.format(
         telegram_bundle_id = telegram_bundle_id,
         telegram_version = telegram_version,
@@ -690,6 +709,8 @@ plist_fragment(
     <string>SyncCore</string>
     <key>CFBundleShortVersionString</key>
     <string>{telegram_version}</string>
+    <key>CFBundlePackageType</key>
+    <string>FMWK</string>
     """.format(
         telegram_bundle_id = telegram_bundle_id,
         telegram_version = telegram_version,
@@ -735,6 +756,8 @@ plist_fragment(
     <string>TelegramCore</string>
     <key>CFBundleShortVersionString</key>
     <string>{telegram_version}</string>
+    <key>CFBundlePackageType</key>
+    <string>FMWK</string>
     """.format(
         telegram_bundle_id = telegram_bundle_id,
         telegram_version = telegram_version,
@@ -783,6 +806,8 @@ plist_fragment(
     <string>AsyncDisplayKit</string>
     <key>CFBundleShortVersionString</key>
     <string>{telegram_version}</string>
+    <key>CFBundlePackageType</key>
+    <string>FMWK</string>
     """.format(
         telegram_bundle_id = telegram_bundle_id,
         telegram_version = telegram_version,
@@ -824,6 +849,8 @@ plist_fragment(
     <string>Display</string>
     <key>CFBundleShortVersionString</key>
     <string>{telegram_version}</string>
+    <key>CFBundlePackageType</key>
+    <string>FMWK</string>
     """.format(
         telegram_bundle_id = telegram_bundle_id,
         telegram_version = telegram_version,
@@ -847,6 +874,33 @@ genrule(
     ]
 )
 
+genrule(
+    name = "GenerateAddAlternateIcons",
+    srcs = [
+        "Telegram-iOS/AddAlternateIcons.sh",
+    ],
+    cmd_bash =
+"""
+    cat $(location Telegram-iOS/AddAlternateIcons.sh) >> $(location AddAlternateIcons.sh)
+""",
+    outs = [
+        "AddAlternateIcons.sh",
+    ],
+    executable = True,
+    visibility = [
+        "//visibility:public",
+    ]
+)
+
+sh_binary(
+    name = "AddAlternateIcons",
+    data = [
+        "Telegram-iOS/AlternateIcons.plist",
+        "Telegram-iOS/AlternateIcons-iPad.plist",
+    ],
+    srcs = [":GenerateAddAlternateIcons"],
+)
+
 ios_framework(
     name = "DisplayFramework",
     bundle_id = "{telegram_bundle_id}.Display".format(
@@ -885,6 +939,8 @@ plist_fragment(
     <string>TelegramUI</string>
     <key>CFBundleShortVersionString</key>
     <string>{telegram_version}</string>
+    <key>CFBundlePackageType</key>
+    <string>FMWK</string>
     """.format(
         telegram_bundle_id = telegram_bundle_id,
         telegram_version = telegram_version,
@@ -1090,6 +1146,10 @@ plist_fragment(
         <key>NSExtensionPointIdentifier</key>
         <string>com.apple.widgetkit-extension</string>
     </dict>
+    <key>UIRequiredDeviceCapabilities</key>
+    <array>
+        <string>arm64</string>
+    </array>
     """.format(
         telegram_bundle_id = telegram_bundle_id,
     )
@@ -1282,6 +1342,10 @@ plist_fragment(
     <string>{telegram_bundle_id}</string>
     <key>CFBundleName</key>
     <string>Telegram</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
     <key>ITSAppUsesNonExemptEncryption</key>
     <false/>
     <key>LSApplicationQueriesSchemes</key>
@@ -1429,191 +1493,6 @@ plist_fragment(
     )
 )
 
-plist_fragment(
-    name = "TelegramInfoIconsPlist",
-    extension = "plist",
-    template = 
-    """
-    <key>CFBundleIcons</key>
-    <dict>
-        <key>CFBundleAlternateIcons</key>
-        <dict>
-            <key>Black</key>
-            <dict>
-                <key>CFBundleIconFiles</key>
-                <array>
-                    <string>BlackIcon</string>
-                    <string>BlackNotificationIcon</string>
-                </array>
-                <key>UIPrerenderedIcon</key>
-                <true/>
-            </dict>
-            <key>BlackClassic</key>
-            <dict>
-                <key>CFBundleIconFiles</key>
-                <array>
-                    <string>BlackClassicIcon</string>
-                    <string>BlackClassicNotificationIcon</string>
-                </array>
-                <key>UIPrerenderedIcon</key>
-                <true/>
-            </dict>
-            <key>BlackFilled</key>
-            <dict>
-                <key>CFBundleIconFiles</key>
-                <array>
-                    <string>BlackFilledIcon</string>
-                </array>
-                <key>UIPrerenderedIcon</key>
-                <true/>
-            </dict>
-            <key>Blue</key>
-            <dict>
-                <key>CFBundleIconFiles</key>
-                <array>
-                    <string>BlueIcon</string>
-                    <string>BlueNotificationIcon</string>
-                </array>
-                <key>UIPrerenderedIcon</key>
-                <true/>
-            </dict>
-            <key>BlueClassic</key>
-            <dict>
-                <key>CFBundleIconFiles</key>
-                <array>
-                    <string>BlueClassicIcon</string>
-                    <string>BlueClassicNotificationIcon</string>
-                </array>
-                <key>UIPrerenderedIcon</key>
-                <true/>
-            </dict>
-            <key>BlueFilled</key>
-            <dict>
-                <key>CFBundleIconFiles</key>
-                <array>
-                    <string>BlueFilledIcon</string>
-                </array>
-                <key>UIPrerenderedIcon</key>
-                <true/>
-            </dict>
-            <key>WhiteFilled</key>
-            <dict>
-                <key>CFBundleIconFiles</key>
-                <array>
-                    <string>WhiteFilledIcon</string>
-                </array>
-                <key>UIPrerenderedIcon</key>
-                <true/>
-            </dict>
-        </dict>
-        <key>CFBundlePrimaryIcon</key>
-        <dict>
-            <key>CFBundleIconFiles</key>
-            <array>
-                <string>IconDefault-60</string>
-                <string>IconDefault-76</string>
-                <string>IconDefault-83.5</string>
-                <string>IconDefault-Small-40</string>
-                <string>IconDefault-Small</string>
-            </array>
-            <key>UIPrerenderedIcon</key>
-            <true/>
-        </dict>
-    </dict>
-    <key>CFBundleIcons~ipad</key>
-    <dict>
-        <key>CFBundleAlternateIcons</key>
-        <dict>
-            <key>Black</key>
-            <dict>
-                <key>CFBundleIconFiles</key>
-                <array>
-                    <string>BlackIconIpad</string>
-                    <string>BlackIconLargeIpad</string>
-                    <string>BlackNotificationIcon</string>
-                </array>
-                <key>UIPrerenderedIcon</key>
-                <true/>
-            </dict>
-            <key>BlackClassic</key>
-            <dict>
-                <key>CFBundleIconFiles</key>
-                <array>
-                    <string>BlackClassicIconIpad</string>
-                    <string>BlackClassicIconLargeIpad</string>
-                    <string>BlackClassicNotificationIcon</string>
-                </array>
-                <key>UIPrerenderedIcon</key>
-                <true/>
-            </dict>
-            <key>BlackFilled</key>
-            <dict>
-                <key>CFBundleIconFiles</key>
-                <array>
-                    <string>BlackFilledIconIpad</string>
-                    <string>BlackFilledIconLargeIpad</string>
-                </array>
-                <key>UIPrerenderedIcon</key>
-                <true/>
-            </dict>
-            <key>Blue</key>
-            <dict>
-                <key>CFBundleIconFiles</key>
-                <array>
-                    <string>BlueIconIpad</string>
-                    <string>BlueIconLargeIpad</string>
-                    <string>BlueNotificationIcon</string>
-                </array>
-                <key>UIPrerenderedIcon</key>
-                <true/>
-            </dict>
-            <key>BlueClassic</key>
-            <dict>
-                <key>CFBundleIconFiles</key>
-                <array>
-                    <string>BlueClassicIconIpad</string>
-                    <string>BlueClassicIconLargeIpad</string>
-                    <string>BlueClassicNotificationIcon</string>
-                </array>
-                <key>UIPrerenderedIcon</key>
-                <true/>
-            </dict>
-            <key>BlueFilled</key>
-            <dict>
-                <key>CFBundleIconFiles</key>
-                <array>
-                    <string>BlueFilledIconIpad</string>
-                    <string>BlueFilledIconLargeIpad</string>
-                </array>
-                <key>UIPrerenderedIcon</key>
-                <true/>
-            </dict>
-            <key>WhiteFilled</key>
-            <dict>
-                <key>CFBundleIconFiles</key>
-                <array>
-                    <string>WhiteFilledIcon</string>
-                </array>
-                <key>UIPrerenderedIcon</key>
-                <true/>
-            </dict>
-        </dict>
-        <key>CFBundlePrimaryIcon</key>
-        <dict>
-            <key>CFBundleIconFiles</key>
-            <array>
-                <string>IconDefault-60</string>
-                <string>IconDefault-76</string>
-                <string>IconDefault-83.5</string>
-                <string>IconDefault-Small-40</string>
-                <string>IconDefault-Small</string>
-            </array>
-            <key>UIPrerenderedIcon</key>
-            <true/>
-        </dict>
-    </dict>
-""")
-
 ios_application(
     name = "Telegram",
     bundle_id = "{telegram_bundle_id}".format(
@@ -1626,9 +1505,11 @@ ios_application(
     infoplists = [
         ":TelegramInfoPlist",
         ":AdditionalInfoPlist",
-        ":TelegramInfoIconsPlist",
     ],
+    ipa_post_processor = ":AddAlternateIcons",
     resources = [
+        ":LaunchScreen",
+        ":DefaultAppIcon",
         ":AdditionalIcons",
     ],
     frameworks = [

Telegram/Telegram-iOS/AddAlternateIcons.sh

@@ -0,0 +1,12 @@
+set -euo pipefail
+
+ADD_PLIST="${0}.runfiles/__main__/Telegram/Telegram-iOS/AlternateIcons.plist"
+ADD_PLIST_IPAD="${0}.runfiles/__main__/Telegram/Telegram-iOS/AlternateIcons-iPad.plist"
+
+INFO_PLIST="$1/Payload/Telegram.app/Info.plist"
+
+/usr/libexec/PlistBuddy -c "add :CFBundleIcons:CFBundleAlternateIcons dict" "$INFO_PLIST"
+/usr/libexec/PlistBuddy -c "add :CFBundleIcons~ipad:CFBundleAlternateIcons dict" "$INFO_PLIST"
+
+/usr/libexec/PlistBuddy -c "merge $ADD_PLIST :CFBundleIcons:CFBundleAlternateIcons" "$INFO_PLIST"
+/usr/libexec/PlistBuddy -c "merge $ADD_PLIST_IPAD :CFBundleIcons~ipad:CFBundleAlternateIcons" "$INFO_PLIST"

Telegram/Telegram-iOS/AlternateIcons-iPad.plist

@@ -0,0 +1,75 @@
+<dict>
+    <key>Black</key>
+    <dict>
+        <key>CFBundleIconFiles</key>
+        <array>
+            <string>BlackIconIpad</string>
+            <string>BlackIconLargeIpad</string>
+            <string>BlackNotificationIcon</string>
+        </array>
+        <key>UIPrerenderedIcon</key>
+        <true/>
+    </dict>
+    <key>BlackClassic</key>
+    <dict>
+        <key>CFBundleIconFiles</key>
+        <array>
+            <string>BlackClassicIconIpad</string>
+            <string>BlackClassicIconLargeIpad</string>
+            <string>BlackClassicNotificationIcon</string>
+        </array>
+        <key>UIPrerenderedIcon</key>
+        <true/>
+    </dict>
+    <key>BlackFilled</key>
+    <dict>
+        <key>CFBundleIconFiles</key>
+        <array>
+            <string>BlackFilledIconIpad</string>
+            <string>BlackFilledIconLargeIpad</string>
+        </array>
+        <key>UIPrerenderedIcon</key>
+        <true/>
+    </dict>
+    <key>Blue</key>
+    <dict>
+        <key>CFBundleIconFiles</key>
+        <array>
+            <string>BlueIconIpad</string>
+            <string>BlueIconLargeIpad</string>
+            <string>BlueNotificationIcon</string>
+        </array>
+        <key>UIPrerenderedIcon</key>
+        <true/>
+    </dict>
+    <key>BlueClassic</key>
+    <dict>
+        <key>CFBundleIconFiles</key>
+        <array>
+            <string>BlueClassicIconIpad</string>
+            <string>BlueClassicIconLargeIpad</string>
+            <string>BlueClassicNotificationIcon</string>
+        </array>
+        <key>UIPrerenderedIcon</key>
+        <true/>
+    </dict>
+    <key>BlueFilled</key>
+    <dict>
+        <key>CFBundleIconFiles</key>
+        <array>
+            <string>BlueFilledIconIpad</string>
+            <string>BlueFilledIconLargeIpad</string>
+        </array>
+        <key>UIPrerenderedIcon</key>
+        <true/>
+    </dict>
+    <key>WhiteFilled</key>
+    <dict>
+        <key>CFBundleIconFiles</key>
+        <array>
+            <string>WhiteFilledIcon</string>
+        </array>
+        <key>UIPrerenderedIcon</key>
+        <true/>
+    </dict>
+</dict>

Telegram/Telegram-iOS/AlternateIcons.plist

@@ -0,0 +1,69 @@
+<dict>
+    <key>Black</key>
+    <dict>
+        <key>CFBundleIconFiles</key>
+        <array>
+            <string>BlackIcon</string>
+            <string>BlackNotificationIcon</string>
+        </array>
+        <key>UIPrerenderedIcon</key>
+        <true/>
+    </dict>
+    <key>BlackClassic</key>
+    <dict>
+        <key>CFBundleIconFiles</key>
+        <array>
+            <string>BlackClassicIcon</string>
+            <string>BlackClassicNotificationIcon</string>
+        </array>
+        <key>UIPrerenderedIcon</key>
+        <true/>
+    </dict>
+    <key>BlackFilled</key>
+    <dict>
+        <key>CFBundleIconFiles</key>
+        <array>
+            <string>BlackFilledIcon</string>
+        </array>
+        <key>UIPrerenderedIcon</key>
+        <true/>
+    </dict>
+    <key>Blue</key>
+    <dict>
+        <key>CFBundleIconFiles</key>
+        <array>
+            <string>BlueIcon</string>
+            <string>BlueNotificationIcon</string>
+        </array>
+        <key>UIPrerenderedIcon</key>
+        <true/>
+    </dict>
+    <key>BlueClassic</key>
+    <dict>
+        <key>CFBundleIconFiles</key>
+        <array>
+            <string>BlueClassicIcon</string>
+            <string>BlueClassicNotificationIcon</string>
+        </array>
+        <key>UIPrerenderedIcon</key>
+        <true/>
+    </dict>
+    <key>BlueFilled</key>
+    <dict>
+        <key>CFBundleIconFiles</key>
+        <array>
+            <string>BlueFilledIcon</string>
+        </array>
+        <key>UIPrerenderedIcon</key>
+        <true/>
+    </dict>
+    <key>WhiteFilled</key>
+    <dict>
+        <key>CFBundleIconFiles</key>
+        <array>
+            <string>WhiteFilledIcon</string>
+        </array>
+        <key>UIPrerenderedIcon</key>
+        <true/>
+    </dict>
+</dict>

buildbox/guest-build-telegram.sh

@@ -111,7 +111,7 @@ elif [ "$1" == "appstore" ]; then
 	APP_TARGET="bazel_app"
 elif [ "$1" == "verify" ]; then
 	BUILD_ENV_SCRIPT="build-system/verify.sh"
-	APP_TARGET="bazel_app_arm64"
+	APP_TARGET="bazel_app"
 	export CODESIGNING_DATA_PATH="build-system/fake-codesigning"
 	export CODESIGNING_CERTS_VARIANT="distribution"
 	export CODESIGNING_PROFILES_VARIANT="appstore"