ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-08-02 00:17:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop 32-bit watch and upgrade to bazel 5.3.0

Browse Source
This commit is contained in:
Ali 2022-09-17 01:55:51 +04:00
parent a14cd136c3
commit c8f7a38140
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/BUILD
View File

@ -722,7 +722,7 @@ watchos_application(
":AppNameInfoPlist", ":AppNameInfoPlist",
":WatchAppCompanionInfoPlist", ":WatchAppCompanionInfoPlist",
], ],
minimum_os_version = "5.0", minimum_os_version = "7.0",
provisioning_profile = select({ provisioning_profile = select({
":disableProvisioningProfilesSetting": None, ":disableProvisioningProfilesSetting": None,
"//conditions:default": "@build_configuration//provisioning:WatchApp.mobileprovision", "//conditions:default": "@build_configuration//provisioning:WatchApp.mobileprovision",
@ -1960,7 +1960,7 @@ ios_application(
}), }),
watch_application = select({ watch_application = select({
":disableExtensionsSetting": None, ":disableExtensionsSetting": None,
"//conditions:default": None,#":TelegramWatchApp", "//conditions:default": ":TelegramWatchApp",
}) if telegram_enable_watch else None, }) if telegram_enable_watch else None,
deps = [ deps = [
":Main", ":Main",

20
build-system/Make/Make.py
View File

@ -144,7 +144,7 @@ class BazelCommandLine:
'--ios_multi_cpus=armv7,arm64', '--ios_multi_cpus=armv7,arm64',
# Always build universal Watch binaries. # Always build universal Watch binaries.
'--watchos_cpus=armv7k,arm64_32' '--watchos_cpus=arm64_32'
] + self.common_debug_args ] + self.common_debug_args
elif configuration == 'debug_arm64': elif configuration == 'debug_arm64':
self.configuration_args = [ self.configuration_args = [
@ -155,7 +155,7 @@ class BazelCommandLine:
'--ios_multi_cpus=arm64', '--ios_multi_cpus=arm64',
# Always build universal Watch binaries. # Always build universal Watch binaries.
'--watchos_cpus=armv7k,arm64_32' '--watchos_cpus=arm64_32'
] + self.common_debug_args ] + self.common_debug_args
elif configuration == 'debug_sim_arm64': elif configuration == 'debug_sim_arm64':
self.configuration_args = [ self.configuration_args = [
@ -166,7 +166,7 @@ class BazelCommandLine:
'--ios_multi_cpus=sim_arm64', '--ios_multi_cpus=sim_arm64',
# Always build universal Watch binaries. # Always build universal Watch binaries.
'--watchos_cpus=armv7k,arm64_32' '--watchos_cpus=arm64_32'
] + self.common_debug_args ] + self.common_debug_args
elif configuration == 'debug_armv7': elif configuration == 'debug_armv7':
self.configuration_args = [ self.configuration_args = [
@ -176,7 +176,7 @@ class BazelCommandLine:
'--ios_multi_cpus=armv7', '--ios_multi_cpus=armv7',
# Always build universal Watch binaries. # Always build universal Watch binaries.
'--watchos_cpus=armv7k,arm64_32' '--watchos_cpus=arm64_32'
] + self.common_debug_args ] + self.common_debug_args
elif configuration == 'release_arm64': elif configuration == 'release_arm64':
self.configuration_args = [ self.configuration_args = [
@ -187,7 +187,7 @@ class BazelCommandLine:
'--ios_multi_cpus=arm64', '--ios_multi_cpus=arm64',
# Always build universal Watch binaries. # Always build universal Watch binaries.
'--watchos_cpus=armv7k,arm64_32', '--watchos_cpus=arm64_32',
# Generate DSYM files when building. # Generate DSYM files when building.
'--apple_generate_dsym', '--apple_generate_dsym',
@ -204,7 +204,7 @@ class BazelCommandLine:
'--ios_multi_cpus=armv7', '--ios_multi_cpus=armv7',
# Always build universal Watch binaries. # Always build universal Watch binaries.
'--watchos_cpus=armv7k,arm64_32', '--watchos_cpus=arm64_32',
# Generate DSYM files when building. # Generate DSYM files when building.
'--apple_generate_dsym', '--apple_generate_dsym',
@ -221,7 +221,7 @@ class BazelCommandLine:
'--ios_multi_cpus=armv7,arm64', '--ios_multi_cpus=armv7,arm64',
# Always build universal Watch binaries. # Always build universal Watch binaries.
'--watchos_cpus=armv7k,arm64_32', '--watchos_cpus=arm64_32',
# Generate DSYM files when building. # Generate DSYM files when building.
'--apple_generate_dsym', '--apple_generate_dsym',
@ -411,7 +411,7 @@ def resolve_codesigning(arguments, base_path, build_configuration, provisioning_
bundle_id=build_configuration.bundle_id, bundle_id=build_configuration.bundle_id,
codesigning_type=arguments.gitCodesigningType, codesigning_type=arguments.gitCodesigningType,
password=password, password=password,
always_fetch=arguments.gitCodesigningAlwaysFetch always_fetch=not arguments.gitCodesigningUseCurrent
) )
elif arguments.codesigningInformationPath is not None: elif arguments.codesigningInformationPath is not None:
profile_source = DirectoryCodesigningSource( profile_source = DirectoryCodesigningSource(
@ -666,10 +666,10 @@ def add_codesigning_common_arguments(current_parser: argparse.ArgumentParser):
) )
current_parser.add_argument( current_parser.add_argument(
'--gitCodesigningAlwaysFetch', '--gitCodesigningUseCurrent',
action='store_true', action='store_true',
required=False, required=False,
default=True, default=False,
help=''' help='''
Always refresh codesigning repository. Always refresh codesigning repository.
''' '''

2
versions.json
View File

@ -1,5 +1,5 @@
{ {
"app": "9.0.1", "app": "9.0.1",
"bazel": "5.1.0", "bazel": "5.3.0",
"xcode": "14.0" "xcode": "14.0"
} }