diff --git a/buildbox/guest-build-telegram.sh b/buildbox/guest-build-telegram.sh index b7705dcd84..c54369bb02 100644 --- a/buildbox/guest-build-telegram.sh +++ b/buildbox/guest-build-telegram.sh @@ -101,10 +101,24 @@ else cd "$SOURCE_PATH" tar -xf "../source.tar" - BUCK="$(pwd)/tools/buck" BUCK_HTTP_CACHE="$BUCK_HTTP_CACHE" LOCAL_CODESIGNING=1 sh "../telegram-ios-shared/buildbox/bin/internal.sh" make app - cp "build/Telegram_signed.ipa" "./Telegram-iOS-Hockeyapp-Internal.ipa" - cp "build/DSYMs.zip" "./Telegram-iOS-Hockeyapp-Internal.app.dSYM.zip" - FASTLANE_BUILD_CONFIGURATION="testinghockeyapp" + if [ "$1" == "hockeyapp" ]; then + BUILD_ENV_SCRIPT="internal" + RESULT_IPA_NAME="Telegram-iOS-Hockeyapp-Internal.ipa" + RESULT_DSYM_NAME="Telegram-iOS-Hockeyapp-Internal.app.dSYM.zip" + FASTLANE_BUILD_CONFIGURATION="internalhockeyapp" + elif [ "$1" == "appstore" ]; then + BUILD_ENV_SCRIPT="appstore" + RESULT_IPA_NAME="Telegram-iOS-AppStoreLLC.ipa" + RESULT_DSYM_NAME="Telegram-iOS-AppStoreLLC.app.dSYM.zip" + FASTLANE_BUILD_CONFIGURATION="testflight_llc" + else + echo "Unsupported configuration $1" + exit 1 + fi + + BUCK="$(pwd)/tools/buck" BUCK_HTTP_CACHE="$BUCK_HTTP_CACHE" LOCAL_CODESIGNING=1 sh "../telegram-ios-shared/buildbox/bin/$BUILD_ENV_SCRIPT.sh" make app + cp "build/Telegram_signed.ipa" "./$RESULT_IPA_NAME" + cp "build/DSYMs.zip" "./$RESULT_DSYM_NAME" FASTLANE_PASSWORD="$FASTLANE_PASSWORD" FASTLANE_ITC_TEAM_NAME="$FASTLANE_ITC_TEAM_NAME" fastlane "$FASTLANE_BUILD_CONFIGURATION" build_number:"$BUILD_NUMBER" commit_hash:"$COMMIT_ID" commit_author:"$COMMIT_AUTHOR" skip_build:1 diff --git a/submodules/Display/Display/WindowContent.swift b/submodules/Display/Display/WindowContent.swift index 369f4ac5d5..fabe7ac0da 100644 --- a/submodules/Display/Display/WindowContent.swift +++ b/submodules/Display/Display/WindowContent.swift @@ -233,7 +233,7 @@ public final class WindowHostView { } fileprivate var onScreenNavigationHeight: CGFloat? { - if #available(iOSApplicationExtension 11.0, *) { + if #available(iOSApplicationExtension 11.0, iOS 11.0, *) { return self.eventView.safeAreaInsets.bottom.isLessThanOrEqualTo(0.0) ? nil : self.eventView.safeAreaInsets.bottom } else { return nil diff --git a/submodules/Emoji/Emoji.xcodeproj/project.pbxproj b/submodules/Emoji/Emoji.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..b9c4156b4b --- /dev/null +++ b/submodules/Emoji/Emoji.xcodeproj/project.pbxproj @@ -0,0 +1,327 @@ + + + + + archiveVersion + 1 + classes + + + objectVersion + 46 + objects + + 1DD70E29CCF717CF00000000 + + isa + PBXFileReference + name + Emoji-Debug.xcconfig + path + ../../buck-out/gen/submodules/Emoji/Emoji-Debug.xcconfig + sourceTree + SOURCE_ROOT + explicitFileType + text.xcconfig + + 1DD70E2950B2F77900000000 + + isa + PBXFileReference + name + Emoji-Profile.xcconfig + path + ../../buck-out/gen/submodules/Emoji/Emoji-Profile.xcconfig + sourceTree + SOURCE_ROOT + explicitFileType + text.xcconfig + + 1DD70E29C449A2DB00000000 + + isa + PBXFileReference + name + Emoji-Release.xcconfig + path + ../../buck-out/gen/submodules/Emoji/Emoji-Release.xcconfig + sourceTree + SOURCE_ROOT + explicitFileType + text.xcconfig + + B401C9792F7F325000000000 + + isa + PBXGroup + name + Buck (Do Not Modify) + sourceTree + ]]> + children + + 1DD70E29CCF717CF00000000 + 1DD70E2950B2F77900000000 + 1DD70E29C449A2DB00000000 + + + B401C979B781F65D00000000 + + isa + PBXGroup + name + Configurations + sourceTree + ]]> + children + + B401C9792F7F325000000000 + + + 1DD70E29001F47FB00000000 + + isa + PBXFileReference + name + BUCK + path + BUCK + sourceTree + SOURCE_ROOT + explicitFileType + text.script.python + + 1DD70E29C4C3D69000000000 + + isa + PBXFileReference + name + EmojiUtils.swift + path + Sources/EmojiUtils.swift + sourceTree + SOURCE_ROOT + + B401C979EAB5339800000000 + + isa + PBXGroup + name + Sources + sourceTree + ]]> + children + + 1DD70E29C4C3D69000000000 + + + B401C97903FF902600000000 + + isa + PBXGroup + name + Emoji + sourceTree + ]]> + children + + 1DD70E29001F47FB00000000 + B401C979EAB5339800000000 + + + 1DD70E29A59C927400000000 + + isa + PBXFileReference + name + libEmoji.a + path + libEmoji.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + B401C979C806358400000000 + + isa + PBXGroup + name + Products + sourceTree + ]]> + children + + 1DD70E29A59C927400000000 + + + B401C979EFB6AC4600000000 + + isa + PBXGroup + name + mainGroup + sourceTree + ]]> + children + + B401C979B781F65D00000000 + B401C97903FF902600000000 + B401C979C806358400000000 + + + E7A30F04C4C3D69000000000 + + isa + PBXBuildFile + fileRef + 1DD70E29C4C3D69000000000 + + 1870857F0000000000000000 + + isa + PBXSourcesBuildPhase + files + + E7A30F04C4C3D69000000000 + + + 4952437303EDA63300000000 + + isa + XCBuildConfiguration + name + Debug + buildSettings + + + baseConfigurationReference + 1DD70E29CCF717CF00000000 + + 4952437350C7218900000000 + + isa + XCBuildConfiguration + name + Profile + buildSettings + + + baseConfigurationReference + 1DD70E2950B2F77900000000 + + 49524373A439BFE700000000 + + isa + XCBuildConfiguration + name + Release + buildSettings + + + baseConfigurationReference + 1DD70E29C449A2DB00000000 + + 218C37090000000000000000 + + isa + XCConfigurationList + buildConfigurations + + 4952437303EDA63300000000 + 4952437350C7218900000000 + 49524373A439BFE700000000 + + defaultConfigurationIsVisible + + + E66DC04E03FF902600000000 + + isa + PBXNativeTarget + name + Emoji + productName + Emoji + productReference + 1DD70E29A59C927400000000 + productType + com.apple.product-type.library.static + dependencies + + + buildPhases + + 1870857F0000000000000000 + + buildConfigurationList + 218C37090000000000000000 + + 4952437303EDA63300000001 + + isa + XCBuildConfiguration + name + Debug + buildSettings + + + + 4952437350C7218900000001 + + isa + XCBuildConfiguration + name + Profile + buildSettings + + + + 49524373A439BFE700000001 + + isa + XCBuildConfiguration + name + Release + buildSettings + + + + 218C37090000000000000001 + + isa + XCConfigurationList + buildConfigurations + + 4952437303EDA63300000001 + 4952437350C7218900000001 + 49524373A439BFE700000001 + + defaultConfigurationIsVisible + + + 96C8479303FF902600000000 + + isa + PBXProject + mainGroup + B401C979EFB6AC4600000000 + targets + + E66DC04E03FF902600000000 + + buildConfigurationList + 218C37090000000000000001 + compatibilityVersion + Xcode 3.2 + attributes + + LastUpgradeCheck + 9999 + + + + rootObject + 96C8479303FF902600000000 + + \ No newline at end of file diff --git a/submodules/Emoji/Emoji.xcodeproj/xcshareddata/xcschemes/Emoji.xcscheme b/submodules/Emoji/Emoji.xcodeproj/xcshareddata/xcschemes/Emoji.xcscheme new file mode 100644 index 0000000000..c4eb6b0a83 --- /dev/null +++ b/submodules/Emoji/Emoji.xcodeproj/xcshareddata/xcschemes/Emoji.xcscheme @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/submodules/SettingsUI/SettingsUI.xcodeproj/project.pbxproj b/submodules/SettingsUI/SettingsUI.xcodeproj/project.pbxproj index 559b07fe45..b4f5706330 100644 --- a/submodules/SettingsUI/SettingsUI.xcodeproj/project.pbxproj +++ b/submodules/SettingsUI/SettingsUI.xcodeproj/project.pbxproj @@ -2552,6 +2552,17 @@ sourceTree SOURCE_ROOT + 1DD70E29AC1638C400000000 + + isa + PBXFileReference + name + ThemeNameGenerator.swift + path + Sources/Themes/ThemeNameGenerator.swift + sourceTree + SOURCE_ROOT + 1DD70E29905A054000000000 isa @@ -2779,6 +2790,7 @@ 1DD70E291CBB5A2900000000 1DD70E29C1FEE9EF00000000 1DD70E29A67F2CCE00000000 + 1DD70E29AC1638C400000000 1DD70E29905A054000000000 1DD70E296CBCC06200000000 1DD70E2934FABB8500000000 @@ -3551,6 +3563,13 @@ fileRef 1DD70E29A67F2CCE00000000 + E7A30F04AC1638C400000000 + + isa + PBXBuildFile + fileRef + 1DD70E29AC1638C400000000 + E7A30F04905A054000000000 isa @@ -3871,6 +3890,7 @@ E7A30F041CBB5A2900000000 E7A30F04C1FEE9EF00000000 E7A30F04A67F2CCE00000000 + E7A30F04AC1638C400000000 E7A30F04905A054000000000 E7A30F046CBCC06200000000 E7A30F0434FABB8500000000 diff --git a/submodules/SinglePhoneInputNode/BUCK b/submodules/SinglePhoneInputNode/BUCK index e54b1d349c..3476160e86 100644 --- a/submodules/SinglePhoneInputNode/BUCK +++ b/submodules/SinglePhoneInputNode/BUCK @@ -9,6 +9,7 @@ static_library( "//submodules/AsyncDisplayKit:AsyncDisplayKit#shared", "//submodules/Display:Display#shared", "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/TelegramStringFormatting:TelegramStringFormatting", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/SinglePhoneInputNode/SinglePhoneInputNode.xcodeproj/project.pbxproj b/submodules/SinglePhoneInputNode/SinglePhoneInputNode.xcodeproj/project.pbxproj index e062668865..70fb8034d9 100644 --- a/submodules/SinglePhoneInputNode/SinglePhoneInputNode.xcodeproj/project.pbxproj +++ b/submodules/SinglePhoneInputNode/SinglePhoneInputNode.xcodeproj/project.pbxproj @@ -91,6 +91,71 @@ explicitFileType compiled.mach-o.dylib + 1DD70E29CE34063500000000 + + isa + PBXFileReference + name + libLocalizedPeerData.a + path + libLocalizedPeerData.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E2936DE2CF900000000 + + isa + PBXFileReference + name + libMediaResources.a + path + libMediaResources.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E290F1A3C6400000000 + + isa + PBXFileReference + name + libPlatformRestrictionMatching.a + path + libPlatformRestrictionMatching.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E29DB6520C800000000 + + isa + PBXFileReference + name + libPostbox.dylib + path + libPostbox.dylib + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + compiled.mach-o.dylib + + 1DD70E29D65BA68200000000 + + isa + PBXFileReference + name + libSwiftSignalKit.dylib + path + libSwiftSignalKit.dylib + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + compiled.mach-o.dylib + 1DD70E29119CDA0700000000 isa @@ -104,6 +169,58 @@ explicitFileType compiled.mach-o.dylib + 1DD70E2984A59C1D00000000 + + isa + PBXFileReference + name + libTelegramPresentationData.a + path + libTelegramPresentationData.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E29DD3C940F00000000 + + isa + PBXFileReference + name + libTelegramStringFormatting.a + path + libTelegramStringFormatting.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E292395015100000000 + + isa + PBXFileReference + name + libTelegramUIPreferences.a + path + libTelegramUIPreferences.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E29F0C15F9C00000000 + + isa + PBXFileReference + name + libTextFormat.a + path + libTextFormat.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + B401C97968022A5500000000 isa @@ -115,7 +232,16 @@ children 1DD70E29FF334B1F00000000 + 1DD70E29CE34063500000000 + 1DD70E2936DE2CF900000000 + 1DD70E290F1A3C6400000000 + 1DD70E29DB6520C800000000 + 1DD70E29D65BA68200000000 1DD70E29119CDA0700000000 + 1DD70E2984A59C1D00000000 + 1DD70E29DD3C940F00000000 + 1DD70E292395015100000000 + 1DD70E29F0C15F9C00000000 1DD70E29135DFEDE00000000 @@ -241,6 +367,69 @@ fileRef 1DD70E29119CDA0700000000 + E7A30F04DB6520C800000000 + + isa + PBXBuildFile + fileRef + 1DD70E29DB6520C800000000 + + E7A30F04D65BA68200000000 + + isa + PBXBuildFile + fileRef + 1DD70E29D65BA68200000000 + + E7A30F0436DE2CF900000000 + + isa + PBXBuildFile + fileRef + 1DD70E2936DE2CF900000000 + + E7A30F042395015100000000 + + isa + PBXBuildFile + fileRef + 1DD70E292395015100000000 + + E7A30F0484A59C1D00000000 + + isa + PBXBuildFile + fileRef + 1DD70E2984A59C1D00000000 + + E7A30F04CE34063500000000 + + isa + PBXBuildFile + fileRef + 1DD70E29CE34063500000000 + + E7A30F040F1A3C6400000000 + + isa + PBXBuildFile + fileRef + 1DD70E290F1A3C6400000000 + + E7A30F04F0C15F9C00000000 + + isa + PBXBuildFile + fileRef + 1DD70E29F0C15F9C00000000 + + E7A30F04DD3C940F00000000 + + isa + PBXBuildFile + fileRef + 1DD70E29DD3C940F00000000 + FAF5FAC90000000000000000 isa @@ -249,6 +438,15 @@ E7A30F04FF334B1F00000000 E7A30F04119CDA0700000000 + E7A30F04DB6520C800000000 + E7A30F04D65BA68200000000 + E7A30F0436DE2CF900000000 + E7A30F042395015100000000 + E7A30F0484A59C1D00000000 + E7A30F04CE34063500000000 + E7A30F040F1A3C6400000000 + E7A30F04F0C15F9C00000000 + E7A30F04DD3C940F00000000 name Fake Swift Dependencies (Copy Files Phase)