diff --git a/Telegram/BUILD b/Telegram/BUILD index a926ee366e..f76a157702 100644 --- a/Telegram/BUILD +++ b/Telegram/BUILD @@ -722,7 +722,7 @@ watchos_application( ":AppNameInfoPlist", ":WatchAppCompanionInfoPlist", ], - minimum_os_version = "5.0", + minimum_os_version = "7.0", provisioning_profile = select({ ":disableProvisioningProfilesSetting": None, "//conditions:default": "@build_configuration//provisioning:WatchApp.mobileprovision", @@ -1960,7 +1960,7 @@ ios_application( }), watch_application = select({ ":disableExtensionsSetting": None, - "//conditions:default": None,#":TelegramWatchApp", + "//conditions:default": ":TelegramWatchApp", }) if telegram_enable_watch else None, deps = [ ":Main", diff --git a/build-system/Make/Make.py b/build-system/Make/Make.py index c1b8b7ecc0..e29d154282 100644 --- a/build-system/Make/Make.py +++ b/build-system/Make/Make.py @@ -144,7 +144,7 @@ class BazelCommandLine: '--ios_multi_cpus=armv7,arm64', # Always build universal Watch binaries. - '--watchos_cpus=armv7k,arm64_32' + '--watchos_cpus=arm64_32' ] + self.common_debug_args elif configuration == 'debug_arm64': self.configuration_args = [ @@ -155,7 +155,7 @@ class BazelCommandLine: '--ios_multi_cpus=arm64', # Always build universal Watch binaries. - '--watchos_cpus=armv7k,arm64_32' + '--watchos_cpus=arm64_32' ] + self.common_debug_args elif configuration == 'debug_sim_arm64': self.configuration_args = [ @@ -166,7 +166,7 @@ class BazelCommandLine: '--ios_multi_cpus=sim_arm64', # Always build universal Watch binaries. - '--watchos_cpus=armv7k,arm64_32' + '--watchos_cpus=arm64_32' ] + self.common_debug_args elif configuration == 'debug_armv7': self.configuration_args = [ @@ -176,7 +176,7 @@ class BazelCommandLine: '--ios_multi_cpus=armv7', # Always build universal Watch binaries. - '--watchos_cpus=armv7k,arm64_32' + '--watchos_cpus=arm64_32' ] + self.common_debug_args elif configuration == 'release_arm64': self.configuration_args = [ @@ -187,7 +187,7 @@ class BazelCommandLine: '--ios_multi_cpus=arm64', # Always build universal Watch binaries. - '--watchos_cpus=armv7k,arm64_32', + '--watchos_cpus=arm64_32', # Generate DSYM files when building. '--apple_generate_dsym', @@ -204,7 +204,7 @@ class BazelCommandLine: '--ios_multi_cpus=armv7', # Always build universal Watch binaries. - '--watchos_cpus=armv7k,arm64_32', + '--watchos_cpus=arm64_32', # Generate DSYM files when building. '--apple_generate_dsym', @@ -221,7 +221,7 @@ class BazelCommandLine: '--ios_multi_cpus=armv7,arm64', # Always build universal Watch binaries. - '--watchos_cpus=armv7k,arm64_32', + '--watchos_cpus=arm64_32', # Generate DSYM files when building. '--apple_generate_dsym', @@ -411,7 +411,7 @@ def resolve_codesigning(arguments, base_path, build_configuration, provisioning_ bundle_id=build_configuration.bundle_id, codesigning_type=arguments.gitCodesigningType, password=password, - always_fetch=arguments.gitCodesigningAlwaysFetch + always_fetch=not arguments.gitCodesigningUseCurrent ) elif arguments.codesigningInformationPath is not None: profile_source = DirectoryCodesigningSource( @@ -666,10 +666,10 @@ def add_codesigning_common_arguments(current_parser: argparse.ArgumentParser): ) current_parser.add_argument( - '--gitCodesigningAlwaysFetch', + '--gitCodesigningUseCurrent', action='store_true', required=False, - default=True, + default=False, help=''' Always refresh codesigning repository. ''' diff --git a/versions.json b/versions.json index 2898b52e53..d93efc0cff 100644 --- a/versions.json +++ b/versions.json @@ -1,5 +1,5 @@ { "app": "9.0.1", - "bazel": "5.1.0", + "bazel": "5.3.0", "xcode": "14.0" }