diff --git a/submodules/Crc32/Crc32_Xcode.xcodeproj/project.pbxproj b/submodules/Crc32/Crc32_Xcode.xcodeproj/project.pbxproj index a393207e5e..ac6072ee0a 100644 --- a/submodules/Crc32/Crc32_Xcode.xcodeproj/project.pbxproj +++ b/submodules/Crc32/Crc32_Xcode.xcodeproj/project.pbxproj @@ -225,7 +225,7 @@ /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ - D0208AAC2306E7EB00A23503 /* HockeyappAlphaMac */ = { + D0208AAC2306E7EB00A23503 /* HockeyappMacAlpha */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -286,9 +286,9 @@ VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = HockeyappAlphaMac; + name = HockeyappMacAlpha; }; - D0208AAD2306E7EB00A23503 /* HockeyappAlphaMac */ = { + D0208AAD2306E7EB00A23503 /* HockeyappMacAlpha */ = { isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_IDENTITY = ""; @@ -312,9 +312,9 @@ SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; }; - name = HockeyappAlphaMac; + name = HockeyappMacAlpha; }; - D0208AAE2306E7EB00A23503 /* HockeyappAlphaMac */ = { + D0208AAE2306E7EB00A23503 /* HockeyappMacAlpha */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -381,6 +381,7 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); + MACH_O_TYPE = staticlib; MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -393,7 +394,7 @@ VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = HockeyappAlphaMac; + name = HockeyappMacAlpha; }; D0208AAF2306E7F700A23503 /* DebugAppStore */ = { isa = XCBuildConfiguration; @@ -551,6 +552,7 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); + MACH_O_TYPE = staticlib; MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -709,6 +711,7 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); + MACH_O_TYPE = staticlib; MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; @@ -866,6 +869,7 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); + MACH_O_TYPE = staticlib; MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; @@ -1290,6 +1294,7 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); + MACH_O_TYPE = staticlib; MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -1371,6 +1376,7 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); + MACH_O_TYPE = staticlib; MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -1446,6 +1452,7 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); + MACH_O_TYPE = staticlib; MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; @@ -1520,6 +1527,7 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); + MACH_O_TYPE = staticlib; MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; @@ -1542,7 +1550,7 @@ D03E456A2305CC310049C28B /* DebugAppStoreLLC */, D03E456F2305CC4E0049C28B /* DebugHockeyapp */, D0208AAF2306E7F700A23503 /* DebugAppStore */, - D0208AAC2306E7EB00A23503 /* HockeyappAlphaMac */, + D0208AAC2306E7EB00A23503 /* HockeyappMacAlpha */, D03E456B2305CC310049C28B /* ReleaseAppStoreLLC */, D0208AB22306E7FD00A23503 /* ReleaseAppStore */, D0208AB52306E80300A23503 /* ReleaseHockeyapp */, @@ -1557,7 +1565,7 @@ D03E456D2305CC310049C28B /* DebugAppStoreLLC */, D03E45702305CC4E0049C28B /* DebugHockeyapp */, D0208AB02306E7F700A23503 /* DebugAppStore */, - D0208AAD2306E7EB00A23503 /* HockeyappAlphaMac */, + D0208AAD2306E7EB00A23503 /* HockeyappMacAlpha */, D03E456E2305CC310049C28B /* ReleaseAppStoreLLC */, D0208AB32306E7FD00A23503 /* ReleaseAppStore */, D0208AB62306E80300A23503 /* ReleaseHockeyapp */, @@ -1572,7 +1580,7 @@ D03E46372306E0BB0049C28B /* DebugAppStoreLLC */, D03E46382306E0BB0049C28B /* DebugHockeyapp */, D0208AB12306E7F700A23503 /* DebugAppStore */, - D0208AAE2306E7EB00A23503 /* HockeyappAlphaMac */, + D0208AAE2306E7EB00A23503 /* HockeyappMacAlpha */, D03E46392306E0BB0049C28B /* ReleaseAppStoreLLC */, D0208AB42306E7FD00A23503 /* ReleaseAppStore */, D0208AB72306E80300A23503 /* ReleaseHockeyapp */, diff --git a/submodules/TelegramCore/TelegramCore/FormatPhoneNumber.m b/submodules/TelegramCore/TelegramCore/FormatPhoneNumber.m index 58e9d3d7e0..31f9d8c847 100644 --- a/submodules/TelegramCore/TelegramCore/FormatPhoneNumber.m +++ b/submodules/TelegramCore/TelegramCore/FormatPhoneNumber.m @@ -3,7 +3,7 @@ #if TARGET_OS_IOS #import #else -#import +#import #endif static NBPhoneNumberUtil *getNBPhoneNumberUtil() { diff --git a/submodules/TelegramCore/TelegramCoreMac/TelegramCoreMac.h b/submodules/TelegramCore/TelegramCoreMac/TelegramCoreMac.h index 2cef829046..1a7e5b057d 100644 --- a/submodules/TelegramCore/TelegramCoreMac/TelegramCoreMac.h +++ b/submodules/TelegramCore/TelegramCoreMac/TelegramCoreMac.h @@ -17,3 +17,7 @@ FOUNDATION_EXPORT const unsigned char TelegramCoreMacVersionString[]; // In this header, you should import all the public headers of your framework using statements like #import +#import +#import +#import +#import diff --git a/submodules/TelegramCore/TelegramCore_Xcode.xcodeproj/project.pbxproj b/submodules/TelegramCore/TelegramCore_Xcode.xcodeproj/project.pbxproj index 892f4f74b5..01709b9ca6 100644 --- a/submodules/TelegramCore/TelegramCore_Xcode.xcodeproj/project.pbxproj +++ b/submodules/TelegramCore/TelegramCore_Xcode.xcodeproj/project.pbxproj @@ -299,7 +299,7 @@ D03E416C2304D5B30049C28B /* ValidateAddressNameInteractive.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03E416B2304D5B30049C28B /* ValidateAddressNameInteractive.swift */; }; D03E452E2305C15A0049C28B /* FormatPhoneNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = D03E452C2305C15A0049C28B /* FormatPhoneNumber.h */; settings = {ATTRIBUTES = (Public, ); }; }; D03E452F2305C15A0049C28B /* FormatPhoneNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = D03E452D2305C15A0049C28B /* FormatPhoneNumber.m */; }; - D03E45302305C1630049C28B /* FormatPhoneNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = D03E452C2305C15A0049C28B /* FormatPhoneNumber.h */; }; + D03E45302305C1630049C28B /* FormatPhoneNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = D03E452C2305C15A0049C28B /* FormatPhoneNumber.h */; settings = {ATTRIBUTES = (Public, ); }; }; D03E45D42305D44A0049C28B /* libphonenumber.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E45D32305D44A0049C28B /* libphonenumber.framework */; }; D03E45D82305D66D0049C28B /* Crypto.h in Headers */ = {isa = PBXBuildFile; fileRef = D02609BB20C6EB97006C34AC /* Crypto.h */; settings = {ATTRIBUTES = (Public, ); }; }; D03E45D92305D66E0049C28B /* Crypto.h in Headers */ = {isa = PBXBuildFile; fileRef = D02609BB20C6EB97006C34AC /* Crypto.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -347,6 +347,8 @@ D049EAF61E44DF3300A2CD3A /* AccountState.swift in Sources */ = {isa = PBXBuildFile; fileRef = D049EAF41E44DF3300A2CD3A /* AccountState.swift */; }; D04CAA5A1E83310D0047E51F /* MD5.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04CAA591E83310D0047E51F /* MD5.swift */; }; D04CAA5B1E83310D0047E51F /* MD5.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04CAA591E83310D0047E51F /* MD5.swift */; }; + D04D21372306EC9A00609388 /* MacInternalUpdater.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04D21362306EC9A00609388 /* MacInternalUpdater.swift */; }; + D04D21382306ECF600609388 /* FormatPhoneNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = D03E452D2305C15A0049C28B /* FormatPhoneNumber.m */; }; D04D8FF4209A4B0700865719 /* NetworkSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04D8FF3209A4B0700865719 /* NetworkSettings.swift */; }; D04D8FF5209A4B0700865719 /* NetworkSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04D8FF3209A4B0700865719 /* NetworkSettings.swift */; }; D050F2101E48AB0600988324 /* InteractivePhoneFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = D050F20F1E48AB0600988324 /* InteractivePhoneFormatter.swift */; }; @@ -983,6 +985,7 @@ D049EAEA1E44B71B00A2CD3A /* RecentlySearchedPeerIds.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RecentlySearchedPeerIds.swift; sourceTree = ""; }; D049EAF41E44DF3300A2CD3A /* AccountState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountState.swift; sourceTree = ""; }; D04CAA591E83310D0047E51F /* MD5.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MD5.swift; sourceTree = ""; }; + D04D21362306EC9A00609388 /* MacInternalUpdater.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MacInternalUpdater.swift; sourceTree = ""; }; D04D8FF3209A4B0700865719 /* NetworkSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkSettings.swift; sourceTree = ""; }; D050F20F1E48AB0600988324 /* InteractivePhoneFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InteractivePhoneFormatter.swift; sourceTree = ""; }; D050F2501E4A59C200988324 /* JoinLink.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JoinLink.swift; sourceTree = ""; }; @@ -1636,6 +1639,14 @@ name = Accounts; sourceTree = ""; }; + D04D21352306EC8700609388 /* Mac Internal Updater */ = { + isa = PBXGroup; + children = ( + D04D21362306EC9A00609388 /* MacInternalUpdater.swift */, + ); + name = "Mac Internal Updater"; + sourceTree = ""; + }; D05A32DF1E6F096B002760B4 /* Settings */ = { isa = PBXGroup; children = ( @@ -1767,6 +1778,7 @@ D09D8C031D4FAB1D0081DBEC /* TelegramCore */ = { isa = PBXGroup; children = ( + D04D21352306EC8700609388 /* Mac Internal Updater */, D03B0CB71D62232000955575 /* Utils */, D03B0CCF1D62242200955575 /* Objects */, D03B0CFE1D62252200955575 /* State */, @@ -2495,6 +2507,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + D04D21382306ECF600609388 /* FormatPhoneNumber.m in Sources */, D021E7E82306EC03002F8BD1 /* OutgoingScheduleInfoMessageAttribute.swift in Sources */, D021E7E92306EC03002F8BD1 /* ScheduledMessages.swift in Sources */, D021E7EA2306EC03002F8BD1 /* ValidateAddressNameInteractive.swift in Sources */, @@ -2825,6 +2838,7 @@ D054648F20738626002ECC1E /* SecureIdDriversLicenseValue.swift in Sources */, D0529D2821A4141800D7C3C4 /* ManagedSynchronizeRecentlyUsedMediaOperations.swift in Sources */, D050F2641E4A5AEB00988324 /* ManagedSynchronizePinnedChatsOperations.swift in Sources */, + D04D21372306EC9A00609388 /* MacInternalUpdater.swift in Sources */, D0575AF21E9FFA5D006F2541 /* SynchronizeSavedGifsOperation.swift in Sources */, D0528E661E65C82400E2FEF5 /* UpdateContactName.swift in Sources */, D0EE7FC82098853100981319 /* SecureIdTemporaryRegistrationValue.swift in Sources */, diff --git a/submodules/libphonenumber/libphonenumber_Xcode.xcodeproj/project.pbxproj b/submodules/libphonenumber/libphonenumber_Xcode.xcodeproj/project.pbxproj index 315dab9d6d..1a04b246b5 100644 --- a/submodules/libphonenumber/libphonenumber_Xcode.xcodeproj/project.pbxproj +++ b/submodules/libphonenumber/libphonenumber_Xcode.xcodeproj/project.pbxproj @@ -604,7 +604,7 @@ }; name = DebugAppStore; }; - D0208AEA2306E87100A23503 /* HockeyappAlphaMac */ = { + D0208AEA2306E87100A23503 /* HockeyappMacAlpha */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -665,9 +665,9 @@ VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = HockeyappAlphaMac; + name = HockeyappMacAlpha; }; - D0208AEB2306E87100A23503 /* HockeyappAlphaMac */ = { + D0208AEB2306E87100A23503 /* HockeyappMacAlpha */ = { isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; @@ -692,9 +692,9 @@ SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; }; - name = HockeyappAlphaMac; + name = HockeyappMacAlpha; }; - D0208AEC2306E87100A23503 /* HockeyappAlphaMac */ = { + D0208AEC2306E87100A23503 /* HockeyappMacAlpha */ = { isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; @@ -720,7 +720,7 @@ SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; }; - name = HockeyappAlphaMac; + name = HockeyappMacAlpha; }; D0208AED2306E87700A23503 /* ReleaseAppStore */ = { isa = XCBuildConfiguration; @@ -1302,7 +1302,7 @@ buildConfigurations = ( D0208AE12306E85800A23503 /* DebugAppStoreLLC */, D0208AE22306E85800A23503 /* DebugHockeyapp */, - D0208AEC2306E87100A23503 /* HockeyappAlphaMac */, + D0208AEC2306E87100A23503 /* HockeyappMacAlpha */, D0208AE92306E86800A23503 /* DebugAppStore */, D0208AE32306E85800A23503 /* ReleaseAppStoreLLC */, D0208AEF2306E87700A23503 /* ReleaseAppStore */, @@ -1317,7 +1317,7 @@ buildConfigurations = ( D03E45902305CE840049C28B /* DebugAppStoreLLC */, D03E45952305CE9A0049C28B /* DebugHockeyapp */, - D0208AEA2306E87100A23503 /* HockeyappAlphaMac */, + D0208AEA2306E87100A23503 /* HockeyappMacAlpha */, D0208AE72306E86800A23503 /* DebugAppStore */, D03E45912305CE840049C28B /* ReleaseAppStoreLLC */, D0208AED2306E87700A23503 /* ReleaseAppStore */, @@ -1332,7 +1332,7 @@ buildConfigurations = ( D03E45932305CE840049C28B /* DebugAppStoreLLC */, D03E45962305CE9A0049C28B /* DebugHockeyapp */, - D0208AEB2306E87100A23503 /* HockeyappAlphaMac */, + D0208AEB2306E87100A23503 /* HockeyappMacAlpha */, D0208AE82306E86800A23503 /* DebugAppStore */, D03E45942305CE840049C28B /* ReleaseAppStoreLLC */, D0208AEE2306E87700A23503 /* ReleaseAppStore */, diff --git a/submodules/sqlcipher/sqlcipher_Xcode.xcodeproj/project.pbxproj b/submodules/sqlcipher/sqlcipher_Xcode.xcodeproj/project.pbxproj index ae83a099c3..6ce127aa97 100644 --- a/submodules/sqlcipher/sqlcipher_Xcode.xcodeproj/project.pbxproj +++ b/submodules/sqlcipher/sqlcipher_Xcode.xcodeproj/project.pbxproj @@ -243,7 +243,7 @@ /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ - D0208AA02306E7B400A23503 /* HockeyappAlphaMac */ = { + D0208AA02306E7B400A23503 /* HockeyappMacAlpha */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -304,9 +304,9 @@ VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = HockeyappAlphaMac; + name = HockeyappMacAlpha; }; - D0208AA12306E7B400A23503 /* HockeyappAlphaMac */ = { + D0208AA12306E7B400A23503 /* HockeyappMacAlpha */ = { isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_IDENTITY = ""; @@ -337,9 +337,9 @@ SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; }; - name = HockeyappAlphaMac; + name = HockeyappMacAlpha; }; - D0208AA22306E7B400A23503 /* HockeyappAlphaMac */ = { + D0208AA22306E7B400A23503 /* HockeyappMacAlpha */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -425,7 +425,7 @@ VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = HockeyappAlphaMac; + name = HockeyappMacAlpha; }; D0208AA32306E7CA00A23503 /* DebugAppStore */ = { isa = XCBuildConfiguration; @@ -1671,7 +1671,7 @@ buildConfigurations = ( D03E45412305C6E40049C28B /* DebugAppStoreLLC */, D03E45462305C7090049C28B /* DebugHockeyapp */, - D0208AA02306E7B400A23503 /* HockeyappAlphaMac */, + D0208AA02306E7B400A23503 /* HockeyappMacAlpha */, D0208AA32306E7CA00A23503 /* DebugAppStore */, D03E45422305C6E40049C28B /* ReleaseAppStoreLLC */, D0208AA62306E7D400A23503 /* ReleaseAppStore */, @@ -1686,7 +1686,7 @@ buildConfigurations = ( D03E45442305C6E40049C28B /* DebugAppStoreLLC */, D03E45472305C7090049C28B /* DebugHockeyapp */, - D0208AA12306E7B400A23503 /* HockeyappAlphaMac */, + D0208AA12306E7B400A23503 /* HockeyappMacAlpha */, D0208AA42306E7CA00A23503 /* DebugAppStore */, D03E45452305C6E40049C28B /* ReleaseAppStoreLLC */, D0208AA72306E7D400A23503 /* ReleaseAppStore */, @@ -1701,7 +1701,7 @@ buildConfigurations = ( D03E461B2306DF740049C28B /* DebugAppStoreLLC */, D03E461C2306DF740049C28B /* DebugHockeyapp */, - D0208AA22306E7B400A23503 /* HockeyappAlphaMac */, + D0208AA22306E7B400A23503 /* HockeyappMacAlpha */, D0208AA52306E7CA00A23503 /* DebugAppStore */, D03E461D2306DF740049C28B /* ReleaseAppStoreLLC */, D0208AA82306E7D400A23503 /* ReleaseAppStore */,