diff --git a/Telegram/BUILD b/Telegram/BUILD index d570c88f26..f7b29682b4 100644 --- a/Telegram/BUILD +++ b/Telegram/BUILD @@ -18,7 +18,7 @@ load("//build-system/bazel-utils:plist_fragment.bzl", ) load( - "//build-input/data:variables.bzl", + "@build_configuration//:variables.bzl", "telegram_build_number", "telegram_version", "telegram_bundle_id", @@ -482,7 +482,7 @@ watchos_extension( ":WatchExtensionNSExtensionInfoPlist", ], minimum_os_version = "5.0", - provisioning_profile = "//build-input/data/provisioning-profiles:WatchExtension.mobileprovision", + provisioning_profile = "@build_configuration//data/provisioning-profiles:WatchExtension.mobileprovision", resources = [ ":TelegramWatchExtensionResources", ], @@ -509,7 +509,7 @@ watchos_application( ":WatchAppCompanionInfoPlist", ], minimum_os_version = "5.0", - provisioning_profile = "//build-input/data/provisioning-profiles:WatchApp.mobileprovision", + provisioning_profile = "@build_configuration//data/provisioning-profiles:WatchApp.mobileprovision", resources = [ ":TelegramWatchAppResources", ":TelegramWatchAppAssets", @@ -1055,7 +1055,7 @@ ios_extension( ":AppNameInfoPlist", ], minimum_os_version = "9.0", - provisioning_profile = "//build-input/data/provisioning-profiles:Share.mobileprovision", + provisioning_profile = "@build_configuration//data/provisioning-profiles:Share.mobileprovision", deps = [":ShareExtensionLib"], frameworks = [ ":TelegramUIFramework" @@ -1123,7 +1123,7 @@ ios_extension( ":AppNameInfoPlist", ], minimum_os_version = "10.0", - provisioning_profile = "//build-input/data/provisioning-profiles:NotificationContent.mobileprovision", + provisioning_profile = "@build_configuration//data/provisioning-profiles:NotificationContent.mobileprovision", deps = [":NotificationContentExtensionLib"], frameworks = [ ":TelegramUIFramework" @@ -1195,7 +1195,7 @@ ios_extension( ], minimum_os_version = "14.0", provides_main = True, - provisioning_profile = "//build-input/data/provisioning-profiles:Widget.mobileprovision", + provisioning_profile = "@build_configuration//data/provisioning-profiles:Widget.mobileprovision", deps = [":WidgetExtensionLib"], frameworks = [ ":SwiftSignalKitFramework", @@ -1283,7 +1283,7 @@ ios_extension( ":AppNameInfoPlist", ], minimum_os_version = "10.0", - provisioning_profile = "//build-input/data/provisioning-profiles:Intents.mobileprovision", + provisioning_profile = "@build_configuration//data/provisioning-profiles:Intents.mobileprovision", deps = [":IntentsExtensionLib"], frameworks = [ ":SwiftSignalKitFramework", @@ -1334,7 +1334,7 @@ ios_extension( ":AppNameInfoPlist", ], minimum_os_version = "10.0", - provisioning_profile = "//build-input/data/provisioning-profiles:NotificationService.mobileprovision", + provisioning_profile = "@build_configuration//data/provisioning-profiles:NotificationService.mobileprovision", deps = ["//Telegram/NotificationService:NotificationServiceExtensionLib"], frameworks = [ ":MtProtoKitFramework", @@ -1522,7 +1522,7 @@ ios_application( ), families = ["iphone", "ipad"], minimum_os_version = "9.0", - provisioning_profile = "//build-input/data/provisioning-profiles:Telegram.mobileprovision", + provisioning_profile = "@build_configuration//data/provisioning-profiles:Telegram.mobileprovision", entitlements = ":TelegramEntitlements.entitlements", infoplists = [ ":TelegramInfoPlist", diff --git a/build-system/bazel_version b/build-system/bazel_version deleted file mode 100644 index 7c69a55dbb..0000000000 --- a/build-system/bazel_version +++ /dev/null @@ -1 +0,0 @@ -3.7.0 diff --git a/build-input/BUILD b/build-system/example-configuration/BUILD similarity index 100% rename from build-input/BUILD rename to build-system/example-configuration/BUILD diff --git a/build-system/example-configuration/WORKSPACE b/build-system/example-configuration/WORKSPACE new file mode 100644 index 0000000000..e69de29bb2 diff --git a/build-system/example-configuration/provisioning/BUILD b/build-system/example-configuration/provisioning/BUILD new file mode 100644 index 0000000000..171ad85d32 --- /dev/null +++ b/build-system/example-configuration/provisioning/BUILD @@ -0,0 +1,4 @@ + +exports_files(glob([ + "*.mobileprovision", +]) diff --git a/build-system/example-configuration/provisioning/Intents.mobileprovision b/build-system/example-configuration/provisioning/Intents.mobileprovision new file mode 100644 index 0000000000..8cb484f943 Binary files /dev/null and b/build-system/example-configuration/provisioning/Intents.mobileprovision differ diff --git a/build-system/example-configuration/provisioning/NotificationContent.mobileprovision b/build-system/example-configuration/provisioning/NotificationContent.mobileprovision new file mode 100644 index 0000000000..bd054573e9 Binary files /dev/null and b/build-system/example-configuration/provisioning/NotificationContent.mobileprovision differ diff --git a/build-system/example-configuration/provisioning/NotificationService.mobileprovision b/build-system/example-configuration/provisioning/NotificationService.mobileprovision new file mode 100644 index 0000000000..663bd68b69 Binary files /dev/null and b/build-system/example-configuration/provisioning/NotificationService.mobileprovision differ diff --git a/build-system/example-configuration/provisioning/Share.mobileprovision b/build-system/example-configuration/provisioning/Share.mobileprovision new file mode 100644 index 0000000000..e49de2d713 Binary files /dev/null and b/build-system/example-configuration/provisioning/Share.mobileprovision differ diff --git a/build-system/example-configuration/provisioning/Telegram.mobileprovision b/build-system/example-configuration/provisioning/Telegram.mobileprovision new file mode 100644 index 0000000000..1592674339 Binary files /dev/null and b/build-system/example-configuration/provisioning/Telegram.mobileprovision differ diff --git a/build-system/example-configuration/provisioning/WatchApp.mobileprovision b/build-system/example-configuration/provisioning/WatchApp.mobileprovision new file mode 100644 index 0000000000..2b0558a240 Binary files /dev/null and b/build-system/example-configuration/provisioning/WatchApp.mobileprovision differ diff --git a/build-system/example-configuration/provisioning/WatchExtension.mobileprovision b/build-system/example-configuration/provisioning/WatchExtension.mobileprovision new file mode 100644 index 0000000000..ba9ce392ff Binary files /dev/null and b/build-system/example-configuration/provisioning/WatchExtension.mobileprovision differ diff --git a/build-system/example-configuration/provisioning/Widget.mobileprovision b/build-system/example-configuration/provisioning/Widget.mobileprovision new file mode 100644 index 0000000000..37de9fe5aa Binary files /dev/null and b/build-system/example-configuration/provisioning/Widget.mobileprovision differ diff --git a/build-system/example-configuration/variables.bzl b/build-system/example-configuration/variables.bzl new file mode 100644 index 0000000000..0d2d187fa2 --- /dev/null +++ b/build-system/example-configuration/variables.bzl @@ -0,0 +1,13 @@ +telegram_build_number = "10000" +telegram_version = "7.3" +telegram_bundle_id = "ph.telegra.Telegraph" +telegram_api_id = "8" +telegram_team_id = "C67CF9S4VU" +telegram_api_hash = "7245de8e747a0d6fbe11f7cc14fcc0bb" +telegram_app_center_id = "0" +telegram_is_internal_build = "false" +telegram_is_appstore_build = "true" +telegram_appstore_id = "0" +telegram_app_specific_url_scheme = "tg" +telegram_aps_environment = "production" +telegram_disable_extensions = False diff --git a/build-system/example-generate-configuration b/build-system/example-generate-configuration new file mode 100755 index 0000000000..79217d6514 --- /dev/null +++ b/build-system/example-generate-configuration @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ ! -d "$1" ]; then + exit 1 +fi + +cp -R build-system/example-configuration/* "$1/" diff --git a/build-system/manage-developer-portal-app.sh b/build-system/manage-developer-portal-app.sh deleted file mode 100644 index 60e21c1381..0000000000 --- a/build-system/manage-developer-portal-app.sh +++ /dev/null @@ -1,129 +0,0 @@ -#!/bin/bash - -set -e - -FASTLANE="$(which fastlane)" - -EXPECTED_VARIABLES=(\ - APPLE_ID \ - BASE_BUNDLE_ID \ - APP_NAME \ - TEAM_ID \ - PROVISIONING_DIRECTORY \ -) - -MISSING_VARIABLES="0" -for VARIABLE_NAME in ${EXPECTED_VARIABLES[@]}; do - if [ "${!VARIABLE_NAME}" = "" ]; then - echo "$VARIABLE_NAME not defined" - MISSING_VARIABLES="1" - fi -done -if [ "$MISSING_VARIABLES" == "1" ]; then - exit 1 -fi - -if [ ! -d "$PROVISIONING_DIRECTORY" ]; then - echo "Directory $PROVISIONING_DIRECTORY does not exist" - exit 1 -fi - -BASE_DIR=$(mktemp -d) -FASTLANE_DIR="$BASE_DIR/fastlane" -mkdir "$FASTLANE_DIR" -FASTFILE="$FASTLANE_DIR/Fastfile" - -touch "$FASTFILE" - -CREDENTIALS=(\ - --username "$APPLE_ID" \ - --team_id "$TEAM_ID" \ -) -export FASTLANE_SKIP_UPDATE_CHECK=1 - -APP_EXTENSIONS=(\ - Share \ - SiriIntents \ - NotificationContent \ - NotificationService \ - Widget \ -) - -echo "lane :manage_app do" >> "$FASTFILE" -echo " produce(" >> "$FASTFILE" -echo " username: '$APPLE_ID'," >> "$FASTFILE" -echo " app_identifier: '${BASE_BUNDLE_ID}'," >> "$FASTFILE" -echo " app_name: '$APP_NAME'," >> "$FASTFILE" -echo " language: 'English'," >> "$FASTFILE" -echo " app_version: '1.0'," >> "$FASTFILE" -echo " team_id: '$TEAM_ID'," >> "$FASTFILE" -echo " skip_itc: true," >> "$FASTFILE" -echo " )" >> "$FASTFILE" - -echo " produce(" >> "$FASTFILE" -echo " username: '$APPLE_ID'," >> "$FASTFILE" -echo " app_identifier: '${BASE_BUNDLE_ID}.watchkitapp'," >> "$FASTFILE" -echo " app_name: '$APP_NAME Watch App'," >> "$FASTFILE" -echo " language: 'English'," >> "$FASTFILE" -echo " app_version: '1.0'," >> "$FASTFILE" -echo " team_id: '$TEAM_ID'," >> "$FASTFILE" -echo " skip_itc: true," >> "$FASTFILE" -echo " )" >> "$FASTFILE" - -echo " produce(" >> "$FASTFILE" -echo " username: '$APPLE_ID'," >> "$FASTFILE" -echo " app_identifier: '${BASE_BUNDLE_ID}.watchkitapp.watchkitextension'," >> "$FASTFILE" -echo " app_name: '$APP_NAME Watch App Extension'," >> "$FASTFILE" -echo " language: 'English'," >> "$FASTFILE" -echo " app_version: '1.0'," >> "$FASTFILE" -echo " team_id: '$TEAM_ID'," >> "$FASTFILE" -echo " skip_itc: true," >> "$FASTFILE" -echo " )" >> "$FASTFILE" - -for EXTENSION in ${APP_EXTENSIONS[@]}; do - echo " produce(" >> "$FASTFILE" - echo " username: '$APPLE_ID'," >> "$FASTFILE" - echo " app_identifier: '${BASE_BUNDLE_ID}.${EXTENSION}'," >> "$FASTFILE" - echo " app_name: '${APP_NAME} ${EXTENSION}'," >> "$FASTFILE" - echo " language: 'English'," >> "$FASTFILE" - echo " app_version: '1.0'," >> "$FASTFILE" - echo " team_id: '$TEAM_ID'," >> "$FASTFILE" - echo " skip_itc: true," >> "$FASTFILE" - echo " )" >> "$FASTFILE" -done - -echo "end" >> "$FASTFILE" - -pushd "$BASE_DIR" - -fastlane cert ${CREDENTIALS[@]} --development - -fastlane manage_app - -fastlane produce group -g "group.$BASE_BUNDLE_ID" -n "$APP_NAME Group" ${CREDENTIALS[@]} - -fastlane produce enable_services -a "$BASE_BUNDLE_ID" ${CREDENTIALS[@]} \ - --app-group \ - --push-notification \ - --sirikit - -fastlane produce associate_group -a "$BASE_BUNDLE_ID" "group.$BASE_BUNDLE_ID" ${CREDENTIALS[@]} -for EXTENSION in ${APP_EXTENSIONS[@]}; do - fastlane produce enable_services -a "${BASE_BUNDLE_ID}.${EXTENSION}" ${CREDENTIALS[@]} \ - --app-group - - fastlane produce associate_group -a "${BASE_BUNDLE_ID}.${EXTENSION}" "group.$BASE_BUNDLE_ID" ${CREDENTIALS[@]} -done - -for DEVELOPMENT_FLAG in "--development"; do - fastlane sigh -a "$BASE_BUNDLE_ID" ${CREDENTIALS[@]} -o "$PROVISIONING_DIRECTORY" $DEVELOPMENT_FLAG \ - --skip_install - for EXTENSION in ${APP_EXTENSIONS[@]}; do - fastlane sigh -a "${BASE_BUNDLE_ID}.${EXTENSION}" ${CREDENTIALS[@]} -o "$PROVISIONING_DIRECTORY" $DEVELOPMENT_FLAG \ - --skip_install - done -done - -popd - -rm -rf "$BASE_DIR" diff --git a/build-system/xcode_version b/build-system/xcode_version deleted file mode 100644 index 5807e59269..0000000000 --- a/build-system/xcode_version +++ /dev/null @@ -1 +0,0 @@ -12.2 diff --git a/versions.json b/versions.json new file mode 100644 index 0000000000..f20027f5a5 --- /dev/null +++ b/versions.json @@ -0,0 +1,4 @@ +{ + "bazel": "3.7.0", + "xcode": "12.3" +}