Merge branch 'beta'

.github/workflows/build.yml

@@ -17,7 +17,9 @@ jobs:
           fetch-depth: '0'
 
       - name: Set active Xcode path
-        run: sudo xcode-select -s /Applications/Xcode_13.2.1.app/Contents/Developer
+        run: |
+          XCODE_VERSION=$(cat versions.json | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["xcode"]);')
+          sudo xcode-select -s /Applications/Xcode_$XCODE_VERSION.app/Contents/Developer
 
       - name: Create canonical source directory
         run: |
@@ -37,15 +39,6 @@ jobs:
           # use canonical bazel root
           BAZEL_USER_ROOT="/private/var/tmp/_bazel_telegram"
 
-          # download bazel
-          mkdir -p $HOME/bazel-dist
-          pushd $HOME/bazel-dist
-          curl -O -L https://github.com/bazelbuild/bazel/releases/download/4.0.0/bazel-4.0.0-darwin-x86_64
-          mv bazel-4.0.0* bazel
-          chmod +x bazel
-          ./bazel --version
-          popd
-
           cd $SOURCE_DIR
 
           BUILD_NUMBER_OFFSET="$(cat build_number_offset)"
@@ -70,9 +63,8 @@ jobs:
           for f in "$CERTS_PATH"/*.p12; do
             security import "$f" -k "$MY_KEYCHAIN" -P "" -T /usr/bin/codesign -T /usr/bin/security
           done
-          # fake certificates are self-signed, so we need to manually mark them as trusted (otherwise bazel will not pick them up)
           for f in "$CERTS_PATH"/*.cer; do
-            sudo security add-trusted-cert -d -r trustRoot -p codeSign -k "$MY_KEYCHAIN" "$f"
+            security import "$f" -k "$MY_KEYCHAIN" -P "" -T /usr/bin/codesign -T /usr/bin/security
           done
           security set-key-partition-list -S apple-tool:,apple: -k "$MY_KEYCHAIN_PASSWORD" "$MY_KEYCHAIN"
 
@@ -83,7 +75,6 @@ jobs:
 
           # build the app
           python3 build-system/Make/Make.py \
-            --bazel="$HOME/bazel-dist/bazel" \
             --bazelUserRoot="$BAZEL_USER_ROOT" \
             build \
             --disableParallelSwiftmoduleGeneration \

build-system/bazel-rules/rules_apple

@@ -1 +1 @@
-Subproject commit c9e8c72c4b94b9e37c7a83f046dfefb742897792
+Subproject commit 782fa6bb135b5a9a31ab7884e9ebfaac29ef71d9

build-system/example-configuration/variables.bzl

@@ -8,7 +8,7 @@ telegram_is_internal_build = "false"
 telegram_is_appstore_build = "true"
 telegram_appstore_id = "686449807"
 telegram_app_specific_url_scheme = "tg"
-telegram_premium_iap_product_id = ""
+telegram_premium_iap_product_id = "org.telegram.telegramPremium.monthly"
 telegram_aps_environment = "production"
 telegram_enable_siri = True
 telegram_enable_icloud = True