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

Update submodules

Browse Source
This commit is contained in:
Peter 2019-06-11 00:45:09 +01:00
parent abe4306486
commit 7e2112f6bc
22 changed files with 103 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.buckconfig
View File

@ -1,14 +1,14 @@
[cxx] [cxx]
default_platform = iphonesimulator-x86_64 default_platform = iphoneos-armv7
cflags = -g -fmodules -fobjc-arc -D BUCK -D DEBUG -w $(config custom.other_cflags) cflags = -g -fmodules -fobjc-arc -D BUCK -D DEBUG -w $(config custom.other_cflags)
cxxflags = -fobjc-arc -std=c++14 -D BUCK -D DEBUG -g $(config custom.other_cxxflags) cxxflags = -fobjc-arc -std=c++14 -D BUCK -D DEBUG -g -w $(config custom.other_cxxflags)
combined_preprocess_and_compile = true combined_preprocess_and_compile = true
pch_enabled = false pch_enabled = false
ldflags = -Xlinker -objc_abi_version -Xlinker 2 -fobjc-arc -fobjc-link-runtime $(config custom.other_cxxflags) ldflags = -Xlinker -objc_abi_version -Xlinker 2 -fobjc-arc -fobjc-link-runtime $(config custom.other_cxxflags)
[swift] [swift]
version = 4.0 version = 4.0
compiler_flags = -DBUCK -enable-testing -enable-batch-mode -g -Onone $(config custom.other_swift_compiler_flags) compiler_flags = -DBUCK -enable-testing -g -Onone -whole-module-optimization -suppress-warnings $(config custom.other_swift_compiler_flags)
use_filelist = true use_filelist = true
[apple] [apple]

1
.gitignore vendored
View File

@ -29,3 +29,4 @@ buck-out/*
AppBinary.xcworkspace/* AppBinary.xcworkspace/*
Project.xcodeproj/* Project.xcodeproj/*
Watch/Watch.xcodeproj/* Watch/Watch.xcodeproj/*
AppBundle.xcworkspace/*

78
BUCK
View File

@ -1,16 +1,21 @@
load('//tools:buck_utils.bzl', 'config_with_updated_linker_flags', 'configs_with_config') load('//tools:buck_utils.bzl', 'config_with_updated_linker_flags', 'configs_with_config', 'combined_config')
load('//tools:buck_defs.bzl', 'SHARED_CONFIGS') load('//tools:buck_defs.bzl', 'SHARED_CONFIGS')
# Adding `-all_load` to our binaries works around https://bugs.swift.org/browse/SR-6004. See the # Adding `-all_load` to our binaries works around https://bugs.swift.org/browse/SR-6004. See the
# longer comment in `ViewController.swift` for more details. # longer comment in `ViewController.swift` for more details.
ALL_LOAD_LINKER_FLAG = '-all_load' ALL_LOAD_LINKER_FLAG = '-all_load'
BUILD_NUMBER = '2001'
APP_CONFIGS = { APP_CONFIGS = {
'ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES': 'YES', 'ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES': 'YES',
'DEVELOPMENT_LANGUAGE': 'Swift', 'DEVELOPMENT_LANGUAGE': 'Swift',
'PRODUCT_BUNDLE_IDENTIFIER': 'ph.telegra.Telegraph', 'PRODUCT_BUNDLE_IDENTIFIER': 'ph.telegra.Telegraph',
'PROVISIONING_PROFILE_SPECIFIER': 'match Development ph.telegra.Telegraph', 'PROVISIONING_PROFILE_SPECIFIER': 'match Development ph.telegra.Telegraph',
'TARGETED_DEVICE_FAMILY': '1,2', 'TARGETED_DEVICE_FAMILY': '1,2',
'APP_NAME': 'Telegram',
'BUILD_NUMBER': BUILD_NUMBER,
'CODE_SIGN_ENTITLEMENTS': 'Telegram-iOS/Telegram-iOS-AppStoreLLC.entitlements',
} }
APP_CONFIGS.update(SHARED_CONFIGS) APP_CONFIGS.update(SHARED_CONFIGS)
@ -21,6 +26,30 @@ apple_resource(
], ],
) )
apple_resource(
name = "StringResources",
files = [],
variants = glob([
"Telegram-iOS/*.lproj/Localizable.strings",
]),
)
apple_resource(
name = "InfoPlistStringResources",
files = [],
variants = glob([
"Telegram-iOS/*.lproj/InfoPlist.strings",
]),
)
apple_resource(
name = "AppIntentVocabularyStringResources",
files = [],
variants = glob([
"Telegram-iOS/*.lproj/AppIntentVocabulary.plist",
]),
)
apple_asset_catalog( apple_asset_catalog(
name = 'Images', name = 'Images',
dirs = [ dirs = [
@ -78,7 +107,6 @@ apple_library(
'Telegram-iOS/UIImage+ImageEffects.h', 'Telegram-iOS/UIImage+ImageEffects.h',
], ],
modular = True, modular = True,
#visibility = ['//submodules/TelegramUI:TelegramUI'],
visibility = ['PUBLIC'], visibility = ['PUBLIC'],
deps = [ deps = [
'//submodules/SSignalKit:SSignalKit', '//submodules/SSignalKit:SSignalKit',
@ -90,31 +118,35 @@ apple_library(
apple_binary( apple_binary(
name = 'AppBinary', name = 'AppBinary',
configs = configs_with_config(config_with_updated_linker_flags(APP_CONFIGS, ALL_LOAD_LINKER_FLAG)), configs = configs_with_config(config_with_updated_linker_flags(APP_CONFIGS, ALL_LOAD_LINKER_FLAG)),
srcs = glob([ #srcs = glob([
'Telegram-iOS/*.swift', # 'Telegram-iOS/*.swift',
]) + [ #]) + [
'Telegram-iOS/main.m', # 'Telegram-iOS/main.m',
], #],
srcs = ['Telegram-iOS/TempMain.m'],
entitlements_file = 'Telegram-iOS/Telegram-iOS-AppStoreLLC.entitlements', entitlements_file = 'Telegram-iOS/Telegram-iOS-AppStoreLLC.entitlements',
deps = [ deps = [
':LaunchScreenXib', ':LaunchScreenXib',
':StringResources',
':InfoPlistStringResources',
':AppIntentVocabularyStringResources',
':Images', ':Images',
'//submodules/AsyncDisplayKit:AsyncDisplayKit', #'//submodules/AsyncDisplayKit:AsyncDisplayKit',
'//submodules/MtProtoKit:MtProtoKit', #'//submodules/MtProtoKit:MtProtoKit',
'//submodules/SSignalKit:SwiftSignalKit', #'//submodules/SSignalKit:SwiftSignalKit',
'//submodules/SSignalKit:SSignalKit', #'//submodules/SSignalKit:SSignalKit',
'//submodules/Display:Display', #'//submodules/Display:Display',
'//submodules/Postbox:Postbox', #'//submodules/Postbox:Postbox',
'//submodules/TelegramCore:TelegramCore', #'//submodules/TelegramCore:TelegramCore',
'//submodules/LegacyComponents:LegacyComponents', #'//submodules/LegacyComponents:LegacyComponents',
'//submodules/HockeySDK-iOS:HockeySDK', #'//submodules/HockeySDK-iOS:HockeySDK',
'//submodules/lottie-ios:Lottie', #'//submodules/lottie-ios:Lottie',
'//submodules/libtgvoip:tgvoip', '//submodules/libtgvoip:tgvoip',
'//submodules/webp:WebP', #'//submodules/webp:WebPImage',
'//submodules/ffmpeg:FFMpeg', #'//submodules/ffmpeg:FFMpeg',
'//submodules/TelegramUI:TelegramUI', #'//submodules/TelegramUI:TelegramUI',
'//submodules/TelegramUI:TelegramUIPrivateModule', '//submodules/TelegramUI:TelegramUIFramework',
'//Watch:WatchUtils', #'//Watch:WatchUtils',
':BuildConfig', ':BuildConfig',
':AppBinaryPrivate', ':AppBinaryPrivate',
], ],
@ -140,7 +172,7 @@ apple_bundle(
'PRODUCT_NAME': 'Telegram', 'PRODUCT_NAME': 'Telegram',
'APP_SPECIFIC_URL_SCHEME': 'tgapp', 'APP_SPECIFIC_URL_SCHEME': 'tgapp',
'VERSION': '5.8', 'VERSION': '5.8',
'BUILD_NUMBER': '2001', 'BUILD_NUMBER': BUILD_NUMBER,
}, },
) )

1
Telegram-iOS.xcodeproj/project.pbxproj
View File

@ -5240,6 +5240,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/submodules/TelegramUI/third-party/opus/lib", "$(PROJECT_DIR)/submodules/TelegramUI/third-party/opus/lib",
); );
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-ObjC", "-ObjC",
"-lz", "-lz",

4
Telegram-iOS/AppDelegate.swift
View File

@ -1145,7 +1145,9 @@ final class SharedApplicationContext {
BITHockeyManager.shared().configure(withIdentifier: hockeyAppId, delegate: self) BITHockeyManager.shared().configure(withIdentifier: hockeyAppId, delegate: self)
BITHockeyManager.shared().crashManager.crashManagerStatus = .alwaysAsk BITHockeyManager.shared().crashManager.crashManagerStatus = .alwaysAsk
BITHockeyManager.shared().start() BITHockeyManager.shared().start()
//BITHockeyManager.shared().authenticator.authenticateInstallation() #if !BUCK
BITHockeyManager.shared().authenticator.authenticateInstallation()
#endif
} }
NotificationCenter.default.addObserver(forName: NSNotification.Name.UIWindowDidBecomeHidden, object: nil, queue: nil, using: { notification in NotificationCenter.default.addObserver(forName: NSNotification.Name.UIWindowDidBecomeHidden, object: nil, queue: nil, using: { notification in

4
Telegram-iOS/en.lproj/Localizable.strings
View File

@ -4358,6 +4358,7 @@ Any member of this group will be able to see messages in the channel.";
"Conversation.Block" = "Block"; "Conversation.Block" = "Block";
"Conversation.ShareMyPhoneNumber" = "Share My Phone Number"; "Conversation.ShareMyPhoneNumber" = "Share My Phone Number";
"Conversation.AddToContacts" = "Add to Contacts"; "Conversation.AddToContacts" = "Add to Contacts";
"Conversation.AddNameToContacts" = "Add %@ to Contacts";
"AddContact.ContactWillBeSharedNow" = "When you tap **Done**, your phone number will become visible to %@."; "AddContact.ContactWillBeSharedNow" = "When you tap **Done**, your phone number will become visible to %@.";
"AddContact.ContactWillBeSharedAfterMutual" = "Phone number vill be visible once %1$@ adds you as a contact. Your phone number will become visible to %1$@."; "AddContact.ContactWillBeSharedAfterMutual" = "Phone number vill be visible once %1$@ adds you as a contact. Your phone number will become visible to %1$@.";
@ -4396,3 +4397,6 @@ Any member of this group will be able to see messages in the channel.";
"Channel.Management.LabelOwner" = "Owner"; "Channel.Management.LabelOwner" = "Owner";
"Channel.Management.LabelAdministrator" = "Administrator"; "Channel.Management.LabelAdministrator" = "Administrator";
"ContactInfo.PhoneNumberHidden" = "Hidden";
"Common.ActionNotAllowedError" = "Sorry, you are not allowed to do this.";

6
Watch/BUCK
View File

@ -1,5 +1,5 @@
load('//tools:buck_utils.bzl', 'config_with_updated_linker_flags', 'configs_with_config') load('//tools:buck_utils.bzl', 'config_with_updated_linker_flags', 'configs_with_config', 'combined_config')
load('//tools:buck_defs.bzl', 'combined_config', 'SHARED_CONFIGS', 'LIB_SPECIFIC_CONFIG') load('//tools:buck_defs.bzl', 'SHARED_CONFIGS', 'EXTENSION_LIB_SPECIFIC_CONFIG')
apple_library( apple_library(
name = 'WatchUtils', name = 'WatchUtils',
@ -63,7 +63,7 @@ apple_library(
'Bridge/TGBridgeReplyMessageMediaAttachment.h', 'Bridge/TGBridgeReplyMessageMediaAttachment.h',
], ],
modular = True, modular = True,
configs = configs_with_config(combined_config([SHARED_CONFIGS, LIB_SPECIFIC_CONFIG])), configs = configs_with_config(combined_config([SHARED_CONFIGS, EXTENSION_LIB_SPECIFIC_CONFIG])),
compiler_flags = [ compiler_flags = [
'-w', '-w',
], ],

2
submodules/AsyncDisplayKit

@ -1 +1 @@
Subproject commit 13bd90f34b5970f188ceb24fd4b8492e2287d68a Subproject commit 02bedc12816e251ad71777f9d2578329b6d2bef6

2
submodules/Display

@ -1 +1 @@
Subproject commit de4fff07b0ab438537dfe79e9ee2ddaf85cef951 Subproject commit bc5c8f60d4f9a0dbd66243008563a86fa1a7c652

2
submodules/HockeySDK-iOS

@ -1 +1 @@
Subproject commit 8f73ff36e501761ef55ea0e68386f70fab06c0a3 Subproject commit c7d0c7026303253e2ac576c02655691e5d314fe2

2
submodules/LegacyComponents

@ -1 +1 @@
Subproject commit 0b8dd35b1d244b9dd3134632b54825571de60934 Subproject commit d5594346161c1b7f203d1e87068bbe77bcaac019

2
submodules/MtProtoKit

@ -1 +1 @@
Subproject commit af62022e7e7abb6998c267bf4ef8f4e4bfb7a566 Subproject commit 14ab734b977fd4f1686a2a13415f6a4c9b9fdd6d

2
submodules/Postbox

@ -1 +1 @@
Subproject commit 6c114a297de7e1eb3f0c9280c990a211997a677a Subproject commit 9667e7f7d8e466bb15485f041b086f01d9e0f8dd

2
submodules/SSignalKit

@ -1 +1 @@
Subproject commit b3cbbf58a13341e09c7183bc41fb7cf23341d741 Subproject commit 359b2ee7c9f20f99f221f78e307369ef5ad0ece2

2
submodules/TelegramCore

@ -1 +1 @@
Subproject commit 9e97905da47478400e081d6d0c2dff6de82cf106 Subproject commit 5603d1fc0955af46143bfcd77422f478c6875ce5

2
submodules/TelegramUI

@ -1 +1 @@
Subproject commit 014a685642b97236e0891cc1afd2bc07aa0f7cb0 Subproject commit 3a98bd98720e1f9863bdf43263f0f15160c2e674

2
submodules/ffmpeg

@ -1 +1 @@
Subproject commit 6a9bbdfbbaddd3884c66fab4dc1c33f03eaa821c Subproject commit 0c7f6f030d3e6a700c1f2be9691a8388a967661a

2
submodules/libtgvoip

@ -1 +1 @@
Subproject commit 2a3b3e3230553cb250d47660976843e78ad5f57f Subproject commit d122740f39d90123ad8aca46c0775738352ba74c

2
submodules/lottie-ios

@ -1 +1 @@
Subproject commit ec26df47682ff0923f5a37ace434cad72a252d27 Subproject commit ff3661145762d1a85da0f045b702411e48e294e6

2
submodules/webp

@ -1 +1 @@
Subproject commit 62dd2a96b4841e61bc78a56936993a9a01a97d91 Subproject commit 4476fa2f8d85c9767ddd750918c4d97f1ee0d0e0

10
tools/buck_defs.bzl
View File

@ -10,11 +10,9 @@ SHARED_CONFIGS = {
LIB_SPECIFIC_CONFIG = { LIB_SPECIFIC_CONFIG = {
'SKIP_INSTALL': 'YES', 'SKIP_INSTALL': 'YES',
'APPLICATION_EXTENSION_API_ONLY': 'YES',
} }
def combined_config(dicts): EXTENSION_LIB_SPECIFIC_CONFIG = {
result = dict() 'SKIP_INSTALL': 'YES',
for d in dicts: 'APPLICATION_EXTENSION_API_ONLY': 'YES',
result.update(d) }
return result

29
tools/buck_utils.bzl
View File

@ -75,16 +75,16 @@ def glob_sub_map(prefix, glob_specs):
result[file_key] = path result[file_key] = path
return result return result
def gen_header_targets(header_paths, prefix, source_rule, source_path): def gen_header_targets(header_paths, prefix, flavor, source_rule, source_path):
result = dict() result = dict()
for header_path in header_paths: for header_path in header_paths:
name = prefix + header_path.replace('/', '_sub_') name = prefix + header_path.replace('/', '_sub_')
native.genrule( native.genrule(
name = name, name = name + flavor,
cmd = 'cp $(location :' + source_rule + ')/' + source_path + '/' + header_path + ' $OUT', cmd = 'cp $(location :' + source_rule + ')/' + source_path + '/' + header_path + ' $OUT',
out = name, out = name,
) )
result[header_path] = ':' + name result[header_path] = ':' + name + flavor
return result return result
def lib_basename(name): def lib_basename(name):
@ -95,14 +95,17 @@ def lib_basename(name):
result = result[:-2] result = result[:-2]
return result return result
def gen_lib_targets(lib_paths, prefix, source_rule, source_path): def combined_config(dicts):
result = [] result = dict()
for lib_path in lib_paths: for d in dicts:
name = lib_path.replace('/', '_sub_') result.update(d)
native.genrule(
name = name,
cmd = 'cp $(location :' + source_rule + ')/' + source_path + '/' + lib_path + ' $OUT',
out = name
)
result.append(name)
return result return result
valid_build_variants = ['project', 'release']
def get_build_variant():
build_variant = native.read_config('build', 'variant', '')
if build_variant not in valid_build_variants:
fail('build_variant should be one of %s' % valid_build_variants)
return build_variant