diff --git a/.buckconfig b/.buckconfig index 739cb939f6..4b52205040 100644 --- a/.buckconfig +++ b/.buckconfig @@ -1,7 +1,7 @@ [cxx] default_platform = iphonesimulator-x86_64 - cflags = -g -fmodules -fobjc-arc -D BUCK -w $(config custom.other_cflags) - cxxflags = -fobjc-arc -std=c++14 -D DEBUG -g $(config custom.other_cxxflags) + cflags = -g -fmodules -fobjc-arc -D BUCK -DTARGET_OS_IOS=1 -D DEBUG -w $(config custom.other_cflags) + cxxflags = -fobjc-arc -std=c++14 -D BUCK -DTARGET_OS_IOS=1 -D DEBUG -g $(config custom.other_cxxflags) combined_preprocess_and_compile = true pch_enabled = false ldflags = -Xlinker -objc_abi_version -Xlinker 2 -fobjc-arc -fobjc-link-runtime $(config custom.other_cxxflags) diff --git a/App/App.xcodeproj/project.pbxproj b/App/App.xcodeproj/project.pbxproj index c4322736fc..b7693ed8f5 100644 --- a/App/App.xcodeproj/project.pbxproj +++ b/App/App.xcodeproj/project.pbxproj @@ -263,19 +263,6 @@ explicitFileType archive.ar - 1DD70E2987C9226300000000 - - isa - PBXFileReference - name - libEmoji.dylib - path - libEmoji.dylib - sourceTree - BUILT_PRODUCTS_DIR - explicitFileType - compiled.mach-o.dylib - 1DD70E29B22505DC00000000 isa @@ -289,6 +276,32 @@ explicitFileType compiled.mach-o.dylib + 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 + B401C97968022A5500000000 isa @@ -300,8 +313,9 @@ children 1DD70E297ADFB9F200000000 - 1DD70E2987C9226300000000 1DD70E29B22505DC00000000 + 1DD70E29DB6520C800000000 + 1DD70E29D65BA68200000000 1DD70E2933D47CB400000000 @@ -384,13 +398,6 @@ fileRef 1DD70E297ADFB9F200000000 - E7A30F0487C9226300000000 - - isa - PBXBuildFile - fileRef - 1DD70E2987C9226300000000 - E7A30F04B22505DC00000000 isa @@ -398,6 +405,20 @@ fileRef 1DD70E29B22505DC00000000 + E7A30F04DB6520C800000000 + + isa + PBXBuildFile + fileRef + 1DD70E29DB6520C800000000 + + E7A30F04D65BA68200000000 + + isa + PBXBuildFile + fileRef + 1DD70E29D65BA68200000000 + 4F426D880000000000000000 isa @@ -405,25 +426,11 @@ files E7A30F047ADFB9F200000000 - E7A30F0487C9226300000000 E7A30F04B22505DC00000000 + E7A30F04DB6520C800000000 + E7A30F04D65BA68200000000 - E7A30F0487C9226300000001 - - isa - PBXBuildFile - fileRef - 1DD70E2987C9226300000000 - settings - - ATTRIBUTES - - CodeSignOnCopy - RemoveHeadersOnCopy - - - E7A30F04B22505DC00000001 isa @@ -439,14 +446,45 @@ + E7A30F04DB6520C800000001 + + isa + PBXBuildFile + fileRef + 1DD70E29DB6520C800000000 + settings + + ATTRIBUTES + + CodeSignOnCopy + RemoveHeadersOnCopy + + + + E7A30F04D65BA68200000001 + + isa + PBXBuildFile + fileRef + 1DD70E29D65BA68200000000 + settings + + ATTRIBUTES + + CodeSignOnCopy + RemoveHeadersOnCopy + + + FAF5FAC90000000000000000 isa PBXCopyFilesBuildPhase files - E7A30F0487C9226300000001 E7A30F04B22505DC00000001 + E7A30F04DB6520C800000001 + E7A30F04D65BA68200000001 dstSubfolderSpec 10 @@ -550,12 +588,19 @@ E7A30F048FA05E8C00000000 - E7A30F0487C9226300000002 + E7A30F04DB6520C800000002 isa PBXBuildFile fileRef - 1DD70E2987C9226300000000 + 1DD70E29DB6520C800000000 + + E7A30F04D65BA68200000002 + + isa + PBXBuildFile + fileRef + 1DD70E29D65BA68200000000 FAF5FAC90000000000000001 @@ -563,7 +608,8 @@ PBXCopyFilesBuildPhase files - E7A30F0487C9226300000002 + E7A30F04DB6520C800000002 + E7A30F04D65BA68200000002 name Fake Swift Dependencies (Copy Files Phase) diff --git a/App/App.xcodeproj/xcshareddata/xcschemes/App.xcscheme b/App/App.xcodeproj/xcshareddata/xcschemes/App.xcscheme index 73dfbeadbe..6ca885fee6 100644 --- a/App/App.xcodeproj/xcshareddata/xcschemes/App.xcscheme +++ b/App/App.xcodeproj/xcshareddata/xcschemes/App.xcscheme @@ -1,85 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/App/App.xcworkspace/buck-project.meta.json b/App/App.xcworkspace/buck-project.meta.json index 4f50c846ae..6aa635f5f5 100644 --- a/App/App.xcworkspace/buck-project.meta.json +++ b/App/App.xcworkspace/buck-project.meta.json @@ -1 +1 @@ -{"required-targets":["//submodules/MtProtoKit:openssl_libs"],"xcconfig-paths":["buck-out/gen/App/App-Debug.xcconfig","buck-out/gen/App/App-Profile.xcconfig","buck-out/gen/App/App-Release.xcconfig","buck-out/gen/App/AppLibrary-Debug.xcconfig","buck-out/gen/App/AppLibrary-Profile.xcconfig","buck-out/gen/App/AppLibrary-Release.xcconfig","buck-out/gen/submodules/Emoji/Emoji#shared-Debug.xcconfig","buck-out/gen/submodules/Emoji/Emoji#shared-Profile.xcconfig","buck-out/gen/submodules/Emoji/Emoji#shared-Release.xcconfig","buck-out/gen/submodules/MtProtoKit/MtProtoKit#shared-Debug.xcconfig","buck-out/gen/submodules/MtProtoKit/MtProtoKit#shared-Profile.xcconfig","buck-out/gen/submodules/MtProtoKit/MtProtoKit#shared-Release.xcconfig","buck-out/gen/submodules/MtProtoKit/openssl-Debug.xcconfig","buck-out/gen/submodules/MtProtoKit/openssl-Profile.xcconfig","buck-out/gen/submodules/MtProtoKit/openssl-Release.xcconfig"],"copy-in-xcode":[]} \ No newline at end of file +{"required-targets":["//submodules/MtProtoKit:openssl_libs"],"xcconfig-paths":["buck-out/gen/App/App-Debug.xcconfig","buck-out/gen/App/App-Profile.xcconfig","buck-out/gen/App/App-Release.xcconfig","buck-out/gen/App/AppLibrary-Debug.xcconfig","buck-out/gen/App/AppLibrary-Profile.xcconfig","buck-out/gen/App/AppLibrary-Release.xcconfig","buck-out/gen/submodules/Crc32/Crc32-Debug.xcconfig","buck-out/gen/submodules/Crc32/Crc32-Profile.xcconfig","buck-out/gen/submodules/Crc32/Crc32-Release.xcconfig","buck-out/gen/submodules/MtProtoKit/MtProtoKit#shared-Debug.xcconfig","buck-out/gen/submodules/MtProtoKit/MtProtoKit#shared-Profile.xcconfig","buck-out/gen/submodules/MtProtoKit/MtProtoKit#shared-Release.xcconfig","buck-out/gen/submodules/MtProtoKit/openssl-Debug.xcconfig","buck-out/gen/submodules/MtProtoKit/openssl-Profile.xcconfig","buck-out/gen/submodules/MtProtoKit/openssl-Release.xcconfig","buck-out/gen/submodules/Postbox/Postbox#shared-Debug.xcconfig","buck-out/gen/submodules/Postbox/Postbox#shared-Profile.xcconfig","buck-out/gen/submodules/Postbox/Postbox#shared-Release.xcconfig","buck-out/gen/submodules/SSignalKit/SwiftSignalKit/SwiftSignalKit#shared-Debug.xcconfig","buck-out/gen/submodules/SSignalKit/SwiftSignalKit/SwiftSignalKit#shared-Profile.xcconfig","buck-out/gen/submodules/SSignalKit/SwiftSignalKit/SwiftSignalKit#shared-Release.xcconfig","buck-out/gen/submodules/sqlcipher/sqlcipher-Debug.xcconfig","buck-out/gen/submodules/sqlcipher/sqlcipher-Profile.xcconfig","buck-out/gen/submodules/sqlcipher/sqlcipher-Release.xcconfig"],"copy-in-xcode":[]} \ No newline at end of file diff --git a/App/App.xcworkspace/contents.xcworkspacedata b/App/App.xcworkspace/contents.xcworkspacedata index 9d9843e511..6abdf7ffbb 100644 --- a/App/App.xcworkspace/contents.xcworkspacedata +++ b/App/App.xcworkspace/contents.xcworkspacedata @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/App/App.xcworkspace/xcshareddata/xcschemes/App.xcscheme b/App/App.xcworkspace/xcshareddata/xcschemes/App.xcscheme index 2fc992b57d..17a2e1a8d1 100644 --- a/App/App.xcworkspace/xcshareddata/xcschemes/App.xcscheme +++ b/App/App.xcworkspace/xcshareddata/xcschemes/App.xcscheme @@ -6,20 +6,6 @@ parallelizeBuildables = "YES" buildImplicitDependencies = "YES"> - - - - @@ -43,11 +29,67 @@ + + + + + + + + + + + + + + + + @@ -71,7 +113,7 @@ @@ -103,7 +145,7 @@ @@ -122,7 +164,7 @@ diff --git a/App/BUCK b/App/BUCK index 1db0e9b759..32b2ec645d 100644 --- a/App/BUCK +++ b/App/BUCK @@ -20,8 +20,11 @@ ui_tests = [ static_library_dependencies = [ ] framework_dependencies = [ - '//submodules/MtProtoKit:MtProtoKit', - '//submodules/Emoji:Emoji', + "//submodules/MtProtoKit:MtProtoKit", + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit", + "//submodules/Postbox:Postbox", + "//submodules/TelegramCore:TelegramCore", + "//submodules/AsyncDisplayKit:AsyncDisplayKit", ] # Build Phase scripts need to be added as dependencies. @@ -36,7 +39,7 @@ apple_library( "//App/...", ], configs = library_configs(), - swift_version = native.read_config('swift', 'version'), + swift_version = native.read_config("swift", "version"), srcs = [ "Sources/TempMain.m", "Sources/Temp.swift" @@ -54,7 +57,7 @@ apple_binary( "//App/...", ], configs = app_binary_configs("App"), - swift_version = native.read_config('swift', 'version'), + swift_version = native.read_config("swift", "version"), srcs = [ "SupportFiles/Empty.swift", ], @@ -80,7 +83,7 @@ apple_bundle( info_plist = "Info.plist", info_plist_substitutions = app_info_plist_substitutions("App"), deps = [ - "//submodules/Emoji:EmojiFiles", + #"//submodules/Emoji:EmojiFiles", ] + framework_bundle_dependencies(framework_dependencies), ) diff --git a/App/Sources/Temp.swift b/App/Sources/Temp.swift index 055945aae6..439ac38375 100644 --- a/App/Sources/Temp.swift +++ b/App/Sources/Temp.swift @@ -1,6 +1,6 @@ import Foundation import UIKit -import Emoji +//import Emoji @objc(AppDelegate1) public final class AppDelegate: NSObject, UIApplicationDelegate { @@ -9,7 +9,7 @@ public final class AppDelegate: NSObject, UIApplicationDelegate { override init() { super.init() - print("OK6".isSingleEmoji) + //print("OK6".isSingleEmoji) } public func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool { diff --git a/Config/app_configuration.bzl b/Config/app_configuration.bzl new file mode 100644 index 0000000000..5ae7cd7e15 --- /dev/null +++ b/Config/app_configuration.bzl @@ -0,0 +1,9 @@ +AppConfig = { + "apiId": "8", + "apiHash": "7245de8e747a0d6fbe11f7cc14fcc0bb", + "hockeyAppId": "ad8831329ffc8f8aff9a2b0b86558b24", + "isInternalBuild": "true", + "isAppStoreBuild": "false", + "appstoreId": "686449807", + "appSpecificUrlScheme": "tgapp", +} diff --git a/Config/buck_rule_macros.bzl b/Config/buck_rule_macros.bzl index ffb8bdcf4e..a297213f88 100644 --- a/Config/buck_rule_macros.bzl +++ b/Config/buck_rule_macros.bzl @@ -84,14 +84,6 @@ def apple_lib( link_style = "static", linker_flags = ["-Wl,-install_name,@rpath/lib%s.dylib" % (name)], ) - native.apple_bundle( - name = name + "Framework", - visibility = visibility, - binary = ":" + name + "#shared", - extension = "framework", - info_plist = "Info.plist", - info_plist_substitutions = info_plist_substitutions(name), - ) else: native.apple_library( @@ -205,14 +197,6 @@ def apple_cxx_lib( **kwargs ) -def apple_cxx_third_party_library( - **kwargs): - apple_cxx_lib( - warning_as_error = False, - suppress_warnings = True, - **kwargs - ) - def framework_binary_dependencies(names): result = [] if native.read_config("custom", "mode") == "project": @@ -234,3 +218,15 @@ def framework_bundle_dependencies(names): result.append(name + "#shared") pass return result + +def gen_header_targets(header_paths, prefix, flavor, source_rule, source_path): + result = dict() + for header_path in header_paths: + name = prefix + header_path.replace('/', '_sub_') + native.genrule( + name = name + flavor, + cmd = 'cp $(location :' + source_rule + ')/' + source_path + '/' + header_path + ' $OUT', + out = name, + ) + result[header_path] = ':' + name + flavor + return result diff --git a/Makefile b/Makefile index 69ff344838..d8c4249734 100644 --- a/Makefile +++ b/Makefile @@ -1,29 +1,21 @@ -.PHONY : install_buck build targets audit project clean +.PHONY : build build_arm64 build_verbose targets project kill_xcode clean BUCK=/Users/peter/build/buck-next/buck/buck-out/gen/programs/buck.pex -log: - echo "Make" - -install_buck: - curl https://jitpack.io/com/github/airbnb/buck/457ebb73fcd8f86be0112dc74948d022b6969dbd/buck-457ebb73fcd8f86be0112dc74948d022b6969dbd.pex --output tools/buck - chmod u+x tools/buck - -build_buck: - sh build_buck.sh - build: - $(BUCK) build //App:AppPackage + $(BUCK) build //App:AppPackage#iphoneos-arm64,iphoneos-armv7 + sh package_app.sh $(BUCK) iphoneos-arm64,iphoneos-armv7 + +build_arm64: + $(BUCK) build //App:AppPackage#iphoneos-arm64 + sh package_app.sh $(BUCK) iphoneos-arm64 build_verbose: - $(BUCK) build //App:AppPackage --verbose 8 + $(BUCK) build //App:AppPackage#iphoneos-armv7,iphoneos-arm64 --verbose 8 targets: $(BUCK) targets //... -audit: - $(BUCK) audit rules BUCK > Config/Gen/App-BUCK.py - kill_xcode: killall Xcode || true killall Simulator || true @@ -35,6 +27,3 @@ project: clean $(BUCK) project //App:workspace --config custom.mode=project open App/App.xcworkspace -next_project: clean - /Users/peter/build/buck-next/buck/buck-out/gen/programs/buck.pex project //App:workspace --config custom.mode=project - #open App/App.xcworkspace diff --git a/Telegram-iOS.xcworkspace/contents.xcworkspacedata b/Telegram-iOS.xcworkspace/contents.xcworkspacedata index b294c9cb24..5ac817a0ba 100644 --- a/Telegram-iOS.xcworkspace/contents.xcworkspacedata +++ b/Telegram-iOS.xcworkspace/contents.xcworkspacedata @@ -177,7 +177,7 @@ location = "container:" name = "Image Processing"> + location = "group:/Users/peter/build/telegram-temp/telegram-ios/submodules/YuvConversion/YuvConversion_Xcode.xcodeproj"> diff --git a/get_dsym.sh b/get_dsym.sh deleted file mode 100644 index 07fc150120..0000000000 --- a/get_dsym.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -rm -rf "DSYM-out" -mkdir -p "DSYM-out" - -PLATFORM="iphonesimulator-x86_64" - -for DEPENDENCY in $(buck query "kind('apple_library|apple_binary', deps('//App:App#$PLATFORM', 1))"); do - case "$DEPENDENCY" in - *"#"*) - ;; - *) - DEPENDENCY="$DEPENDENCY#$PLATFORM" - ;; - esac - DSYM_PATH="buck-out/gen/$(echo "$DEPENDENCY" | sed -e "s/#/#apple-dsym,/" | sed -e "s#^//##" | sed -e "s#:#/#").dSYM" - cp -f -r "$DSYM_PATH" "DSYM-out/" -done diff --git a/package_app.sh b/package_app.sh new file mode 100644 index 0000000000..93e9920b42 --- /dev/null +++ b/package_app.sh @@ -0,0 +1,44 @@ +#!/bin/sh + +set -x + +if [ -z "$1" ] || [ -z "$2" ]; then + echo "Usage: sh package_app.sh path/to/buck platform-flavors" + exit 1 +fi + +PLATFORM_FLAVORS="$2" +BUCK="$1" + +BUILD_PATH="build" +APP_NAME="Telegram" + +IPA_PATH="$BUILD_PATH/$APP_NAME.ipa" +DSYMS_FOLDER_NAME="DSYMs" +DSYMS_ZIP="$BUILD_PATH/$DSYMS_FOLDER_NAME.zip" +DSYMS_DIR="$BUILD_PATH/$DSYMS_FOLDER_NAME" + +mkdir -p "$BUILD_PATH" +rm -f "$IPA_PATH" +rm -f "$DSYMS_ZIP" +rm -rf "$DSYMS_DIR" +mkdir -p "$DSYMS_DIR" + +cp "buck-out/gen/App/AppPackage#$PLATFORM_FLAVORS.ipa" "$IPA_PATH" + +for DEPENDENCY in $($BUCK query "kind('apple_library|apple_binary', deps('//App:App#$PLATFORM_FLAVORS', 1))"); do + case "$DEPENDENCY" in + *"#"*) + ;; + *) + DEPENDENCY="$DEPENDENCY#$PLATFORM_FLAVORS" + ;; + esac + DSYM_PATH="buck-out/gen/$(echo "$DEPENDENCY" | sed -e "s/#/#apple-dsym,/" | sed -e "s#^//##" | sed -e "s#:#/#").dSYM" + cp -f -r "$DSYM_PATH" "$DSYMS_DIR/" +done + +DIR=$(pwd) +cd "$BUILD_PATH" +zip -r "$DSYMS_FOLDER_NAME.zip" "$DSYMS_FOLDER_NAME" +cd "$DIR" diff --git a/submodules/AccountContext/BUCK b/submodules/AccountContext/BUCK new file mode 100644 index 0000000000..e51b9d54b5 --- /dev/null +++ b/submodules/AccountContext/BUCK @@ -0,0 +1,23 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "AccountContext", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/TelegramAudio:TelegramAudio", + "//submodules/AsyncDisplayKit:AsyncDisplayKit#dynamic", + "//submodules/TemporaryCachedPeerDataManager:TemporaryCachedPeerDataManager", + "//submodules/DeviceLocationManager:DeviceLocationManager", + "//submodules/MediaPlayer:UniversalMediaPlayer", + "//submodules/TelegramPresentationData:TelegramPresentationData", + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#dynamic", + "//submodules/Postbox:Postbox#dynamic", + "//submodules/TelegramCore:TelegramCore#dynamic", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/Contacts.framework", + ], +) diff --git a/submodules/ActionSheetPeerItem/BUCK b/submodules/ActionSheetPeerItem/BUCK new file mode 100644 index 0000000000..936ed9ab5a --- /dev/null +++ b/submodules/ActionSheetPeerItem/BUCK @@ -0,0 +1,20 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "ActionSheetPeerItem", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/AvatarNode", + "//submodules/TelegramPresentationData", + "//submodules/Postbox", + "//submodules/TelegramCore", + "//submodules/Display", + "//submodules/AsyncDisplayKit", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/ActivityIndicator/BUCK b/submodules/ActivityIndicator/BUCK new file mode 100644 index 0000000000..95c864b5b1 --- /dev/null +++ b/submodules/ActivityIndicator/BUCK @@ -0,0 +1,16 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "ActivityIndicator", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/TelegramPresentationData", + "//submodules/AsyncDisplayKit", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/AlertUI/BUCK b/submodules/AlertUI/BUCK new file mode 100644 index 0000000000..b3c31cecb7 --- /dev/null +++ b/submodules/AlertUI/BUCK @@ -0,0 +1,15 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "AlertUI", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#dynamic", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/AnimationUI/BUCK b/submodules/AnimationUI/BUCK new file mode 100644 index 0000000000..601bdfe3d0 --- /dev/null +++ b/submodules/AnimationUI/BUCK @@ -0,0 +1,27 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "AnimationUI", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/Postbox:Postbox#shared", + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/AsyncDisplayKit:AsyncDisplayKit#shared", + "//submodules/Display:Display#shared", + "//submodules/YuvConversion:YuvConversion", + "//submodules/StickerResources:StickerResources", + "//submodules/MediaResources:MediaResources", + "//submodules/Tuples:Tuples", + "//submodules/GZip:GZip", + "//submodules/RLottie:RLottie", + "//submodules/lottie-ios:Lottie", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + "$SDKROOT/System/Library/Frameworks/MobileCoreServices.framework", + ], +) diff --git a/submodules/AsyncDisplayKit/BUCK b/submodules/AsyncDisplayKit/BUCK new file mode 100644 index 0000000000..50488256ca --- /dev/null +++ b/submodules/AsyncDisplayKit/BUCK @@ -0,0 +1,39 @@ +load("//Config:buck_rule_macros.bzl", "framework") + +ASYNCDISPLAYKIT_EXPORTED_HEADERS = glob([ + "Source/*.h", + "Source/Details/**/*.h", + "Source/Layout/*.h", + "Source/Base/*.h", + "Source/Debug/AsyncDisplayKit+Debug.h", + "Source/TextKit/ASTextNodeTypes.h", + "Source/TextKit/ASTextKitComponents.h" +]) + +ASYNCDISPLAYKIT_PRIVATE_HEADERS = glob([ + "Source/**/*.h" + ], + exclude = ASYNCDISPLAYKIT_EXPORTED_HEADERS, +) + +framework( + name = "AsyncDisplayKit", + headers = ASYNCDISPLAYKIT_PRIVATE_HEADERS, + exported_headers = ASYNCDISPLAYKIT_EXPORTED_HEADERS, + srcs = glob([ + "Source/**/*.m", + "Source/**/*.mm", + "Source/Base/*.m" + ]), + compiler_flags = [ + "-DMINIMAL_ASDK", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + "$SDKROOT/System/Library/Frameworks/QuartzCore.framework", + "$SDKROOT/System/Library/Frameworks/CoreMedia.framework", + "$SDKROOT/System/Library/Frameworks/CoreText.framework", + "$SDKROOT/System/Library/Frameworks/CoreGraphics.framework", + ] +) diff --git a/submodules/AuthorizationUI/BUCK b/submodules/AuthorizationUI/BUCK new file mode 100644 index 0000000000..fe71558b72 --- /dev/null +++ b/submodules/AuthorizationUI/BUCK @@ -0,0 +1,19 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "AuthorizationUI", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/AsyncDisplayKit:AsyncDisplayKit#shared", + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/Display:Display#shared", + "//submodules/TextFormat:TextFormat", + "//submodules/TelegramPresentationData:TelegramPresentationData", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/AvatarNode/BUCK b/submodules/AvatarNode/BUCK new file mode 100644 index 0000000000..d73806bdb1 --- /dev/null +++ b/submodules/AvatarNode/BUCK @@ -0,0 +1,19 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "AvatarNode", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/AsyncDisplayKit:AsyncDisplayKit#shared", + "//submodules/Display:Display#shared", + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/TelegramPresentationData:TelegramPresentationData", + "//submodules/AnimationUI:AnimationUI", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/BotPaymentsUI/BUCK b/submodules/BotPaymentsUI/BUCK new file mode 100644 index 0000000000..6a1fa831de --- /dev/null +++ b/submodules/BotPaymentsUI/BUCK @@ -0,0 +1,14 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "BotPaymentsUI", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/BuildConfig/BUCK b/submodules/BuildConfig/BUCK new file mode 100644 index 0000000000..cdf9a1bed4 --- /dev/null +++ b/submodules/BuildConfig/BUCK @@ -0,0 +1,31 @@ +load("//Config:buck_rule_macros.bzl", "static_library") +load("//Config:app_configuration.bzl", "AppConfig") + +static_library( + name = "BuildConfig", + srcs = glob([ + "Sources/*.m", + ]), + compiler_flags = [ + '-DAPP_CONFIG_API_ID=' + AppConfig["apiId"], + '-DAPP_CONFIG_API_HASH="' + AppConfig["apiHash"] + '"', + '-DAPP_CONFIG_HOCKEYAPP_ID="' + AppConfig["hockeyAppId"] + '"', + '-DAPP_CONFIG_IS_INTERNAL_BUILD=' + AppConfig["isInternalBuild"], + '-DAPP_CONFIG_IS_APPSTORE_BUILD=' + AppConfig["isAppStoreBuild"], + '-DAPP_CONFIG_APPSTORE_ID=' + AppConfig["appstoreId"], + '-DAPP_SPECIFIC_URL_SCHEME="' + AppConfig["appSpecificUrlScheme"] + '"', + + ], + headers = glob([ + "Sources/*.h", + ]), + exported_headers = glob([ + "Sources/*.h", + ]), + deps = [ + "//submodules/MtProtoKit:MtProtoKit#shared", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/CallListUI/BUCK b/submodules/CallListUI/BUCK new file mode 100644 index 0000000000..befe9de3b6 --- /dev/null +++ b/submodules/CallListUI/BUCK @@ -0,0 +1,14 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "CallListUI", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/ChatListSearchItemHeader/BUCK b/submodules/ChatListSearchItemHeader/BUCK new file mode 100644 index 0000000000..7785b366ea --- /dev/null +++ b/submodules/ChatListSearchItemHeader/BUCK @@ -0,0 +1,14 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "ChatListSearchItemHeader", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/ChatListSearchItemNode/BUCK b/submodules/ChatListSearchItemNode/BUCK new file mode 100644 index 0000000000..6a47191e3b --- /dev/null +++ b/submodules/ChatListSearchItemNode/BUCK @@ -0,0 +1,14 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "ChatListSearchItemNode", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/ChatListSearchRecentPeersNode/BUCK b/submodules/ChatListSearchRecentPeersNode/BUCK new file mode 100644 index 0000000000..796b9fd499 --- /dev/null +++ b/submodules/ChatListSearchRecentPeersNode/BUCK @@ -0,0 +1,14 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "ChatListSearchRecentPeersNode", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/ChatListUI/BUCK b/submodules/ChatListUI/BUCK new file mode 100644 index 0000000000..3c9a58b514 --- /dev/null +++ b/submodules/ChatListUI/BUCK @@ -0,0 +1,14 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "ChatListUI", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/ChatTitleActivityNode/BUCK b/submodules/ChatTitleActivityNode/BUCK new file mode 100644 index 0000000000..3f8d136666 --- /dev/null +++ b/submodules/ChatTitleActivityNode/BUCK @@ -0,0 +1,14 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "ChatTitleActivityNode", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/CheckNode/BUCK b/submodules/CheckNode/BUCK new file mode 100644 index 0000000000..138e1ec664 --- /dev/null +++ b/submodules/CheckNode/BUCK @@ -0,0 +1,24 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "CheckNode", + srcs = glob([ + "Sources/**/*.swift", + "Sources/*.m", + ]), + headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/TelegramPresentationData.h"]), + exported_headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/TelegramPresentationData.h"]), + deps = [ + "//submodules/AsyncDisplayKit:AsyncDisplayKit#shared", + "//submodules/Display:Display#shared", + "//submodules/LegacyComponents:LegacyComponents", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/Crc32/BUCK b/submodules/Crc32/BUCK new file mode 100644 index 0000000000..9e0e9aeb63 --- /dev/null +++ b/submodules/Crc32/BUCK @@ -0,0 +1,19 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "Crc32", + srcs = glob([ + "Sources/*.m", + ]), + headers = glob([ + "Sources/*.h", + ]), + exported_headers = glob([ + "Sources/*.h", + ]), + deps = [ + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/Crc32/Crc32.xcodeproj/project.pbxproj b/submodules/Crc32/Crc32.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..f3139f1770 --- /dev/null +++ b/submodules/Crc32/Crc32.xcodeproj/project.pbxproj @@ -0,0 +1,343 @@ + + + + + archiveVersion + 1 + classes + + + objectVersion + 46 + objects + + 1DD70E29005B5D4200000000 + + isa + PBXFileReference + name + Crc32-Debug.xcconfig + path + ../../buck-out/gen/submodules/Crc32/Crc32-Debug.xcconfig + sourceTree + SOURCE_ROOT + explicitFileType + text.xcconfig + + 1DD70E293C1BAC2C00000000 + + isa + PBXFileReference + name + Crc32-Profile.xcconfig + path + ../../buck-out/gen/submodules/Crc32/Crc32-Profile.xcconfig + sourceTree + SOURCE_ROOT + explicitFileType + text.xcconfig + + 1DD70E29AFB2578E00000000 + + isa + PBXFileReference + name + Crc32-Release.xcconfig + path + ../../buck-out/gen/submodules/Crc32/Crc32-Release.xcconfig + sourceTree + SOURCE_ROOT + explicitFileType + text.xcconfig + + B401C9792F7F325000000000 + + isa + PBXGroup + name + Buck (Do Not Modify) + sourceTree + ]]> + children + + 1DD70E29005B5D4200000000 + 1DD70E293C1BAC2C00000000 + 1DD70E29AFB2578E00000000 + + + B401C979B781F65D00000000 + + isa + PBXGroup + name + Configurations + sourceTree + ]]> + children + + B401C9792F7F325000000000 + + + 1DD70E29001F47FB00000000 + + isa + PBXFileReference + name + BUCK + path + BUCK + sourceTree + SOURCE_ROOT + explicitFileType + text.script.python + + 1DD70E29A055004D00000000 + + isa + PBXFileReference + name + Crc32.h + path + Sources/Crc32.h + sourceTree + SOURCE_ROOT + lastKnownFileType + sourcecode.c.h + + 1DD70E29A055005200000000 + + isa + PBXFileReference + name + Crc32.m + path + Sources/Crc32.m + sourceTree + SOURCE_ROOT + lastKnownFileType + sourcecode.c.objc + + B401C979EAB5339800000000 + + isa + PBXGroup + name + Sources + sourceTree + ]]> + children + + 1DD70E29A055004D00000000 + 1DD70E29A055005200000000 + + + B401C97903E5731300000000 + + isa + PBXGroup + name + Crc32 + sourceTree + ]]> + children + + 1DD70E29001F47FB00000000 + B401C979EAB5339800000000 + + + 1DD70E2943956E2100000000 + + isa + PBXFileReference + name + libCrc32.a + path + libCrc32.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + B401C979C806358400000000 + + isa + PBXGroup + name + Products + sourceTree + ]]> + children + + 1DD70E2943956E2100000000 + + + B401C979EFB6AC4600000000 + + isa + PBXGroup + name + mainGroup + sourceTree + ]]> + children + + B401C979B781F65D00000000 + B401C97903E5731300000000 + B401C979C806358400000000 + + + E7A30F04A055005200000000 + + isa + PBXBuildFile + fileRef + 1DD70E29A055005200000000 + + 1870857F0000000000000000 + + isa + PBXSourcesBuildPhase + files + + E7A30F04A055005200000000 + + + 4952437303EDA63300000000 + + isa + XCBuildConfiguration + name + Debug + buildSettings + + + baseConfigurationReference + 1DD70E29005B5D4200000000 + + 4952437350C7218900000000 + + isa + XCBuildConfiguration + name + Profile + buildSettings + + + baseConfigurationReference + 1DD70E293C1BAC2C00000000 + + 49524373A439BFE700000000 + + isa + XCBuildConfiguration + name + Release + buildSettings + + + baseConfigurationReference + 1DD70E29AFB2578E00000000 + + 218C37090000000000000000 + + isa + XCConfigurationList + buildConfigurations + + 4952437303EDA63300000000 + 4952437350C7218900000000 + 49524373A439BFE700000000 + + defaultConfigurationIsVisible + + + E66DC04E03E5731300000000 + + isa + PBXNativeTarget + name + Crc32 + productName + Crc32 + productReference + 1DD70E2943956E2100000000 + 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 + + + 96C8479303E5731300000000 + + isa + PBXProject + mainGroup + B401C979EFB6AC4600000000 + targets + + E66DC04E03E5731300000000 + + buildConfigurationList + 218C37090000000000000001 + compatibilityVersion + Xcode 3.2 + attributes + + LastUpgradeCheck + 9999 + + + + rootObject + 96C8479303E5731300000000 + + \ No newline at end of file diff --git a/submodules/Crc32/Crc32.xcodeproj/xcshareddata/xcschemes/Crc32.xcscheme b/submodules/Crc32/Crc32.xcodeproj/xcshareddata/xcschemes/Crc32.xcscheme new file mode 100644 index 0000000000..5a65a966da --- /dev/null +++ b/submodules/Crc32/Crc32.xcodeproj/xcshareddata/xcschemes/Crc32.xcscheme @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/submodules/DeviceAccess/BUCK b/submodules/DeviceAccess/BUCK new file mode 100644 index 0000000000..338c5617de --- /dev/null +++ b/submodules/DeviceAccess/BUCK @@ -0,0 +1,19 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "DeviceAccess", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/Display:Display#shared", + "//submodules/AccountContext:AccountContext", + "//submodules/TelegramPresentationData:TelegramPresentationData", + "//submodules/LegacyComponents:LegacyComponents", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/DeviceLocationManager/BUCK b/submodules/DeviceLocationManager/BUCK new file mode 100644 index 0000000000..46d95a6f88 --- /dev/null +++ b/submodules/DeviceLocationManager/BUCK @@ -0,0 +1,15 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "DeviceLocationManager", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#dynamic", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/CoreLocation.framework", + ], +) diff --git a/submodules/DeviceProximity/BUCK b/submodules/DeviceProximity/BUCK new file mode 100644 index 0000000000..8d7d99755b --- /dev/null +++ b/submodules/DeviceProximity/BUCK @@ -0,0 +1,18 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "DeviceProximity", + srcs = glob([ + "Sources/*.m", + ]), + headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/DeviceProximity.h"]), + exported_headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/DeviceProximity.h"]), + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/Display/BUCK b/submodules/Display/BUCK new file mode 100644 index 0000000000..fd888b797c --- /dev/null +++ b/submodules/Display/BUCK @@ -0,0 +1,23 @@ +load("//Config:buck_rule_macros.bzl", "framework") + +framework( + name = "Display", + srcs = glob([ + "Display/*.swift", + "Display/*.m", + ]), + headers = glob([ + "Display/*.h", + ], exclude = ["Display/Display.h"]), + exported_headers = glob([ + "Display/*.h", + ], exclude = ["Display/Display.h"]), + deps = [ + "//submodules/AsyncDisplayKit:AsyncDisplayKit#dynamic", + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#dynamic", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/Display/Display/ActionSheetControllerNode.swift b/submodules/Display/Display/ActionSheetControllerNode.swift index af9c7fdfa1..643004021f 100644 --- a/submodules/Display/Display/ActionSheetControllerNode.swift +++ b/submodules/Display/Display/ActionSheetControllerNode.swift @@ -34,7 +34,7 @@ final class ActionSheetControllerNode: ASDisplayNode, UIScrollViewDelegate { self.scrollNode.canCancelAllTouchesInViews = true self.scrollView = self.scrollNode.view - if #available(iOSApplicationExtension 11.0, *) { + if #available(iOSApplicationExtension 11.0, iOS 11.0, *) { self.scrollView.contentInsetAdjustmentBehavior = .never } self.scrollView.alwaysBounceVertical = true diff --git a/submodules/Display/Display/ActionSheetItemGroupNode.swift b/submodules/Display/Display/ActionSheetItemGroupNode.swift index 50801c91b8..b14c2da2c1 100644 --- a/submodules/Display/Display/ActionSheetItemGroupNode.swift +++ b/submodules/Display/Display/ActionSheetItemGroupNode.swift @@ -43,7 +43,7 @@ final class ActionSheetItemGroupNode: ASDisplayNode, UIScrollViewDelegate { self.scrollNode = ASScrollNode() self.scrollNode.canCancelAllTouchesInViews = true - if #available(iOSApplicationExtension 11.0, *) { + if #available(iOSApplicationExtension 11.0, iOS 11.0, *) { self.scrollNode.view.contentInsetAdjustmentBehavior = .never } self.scrollNode.view.delaysContentTouches = false diff --git a/submodules/Display/Display/CAAnimationUtils.swift b/submodules/Display/Display/CAAnimationUtils.swift index 81cf94009a..f107a5b7fe 100644 --- a/submodules/Display/Display/CAAnimationUtils.swift +++ b/submodules/Display/Display/CAAnimationUtils.swift @@ -1,9 +1,5 @@ import UIKit -#if BUCK -import DisplayPrivate -#endif - @objc private class CALayerAnimationDelegate: NSObject, CAAnimationDelegate { private let keyPath: String? var completion: ((Bool) -> Void)? diff --git a/submodules/Display/Display/ContextMenuNode.swift b/submodules/Display/Display/ContextMenuNode.swift index 7c3f9ffc4b..bbb0bfa760 100644 --- a/submodules/Display/Display/ContextMenuNode.swift +++ b/submodules/Display/Display/ContextMenuNode.swift @@ -249,7 +249,7 @@ final class ContextMenuNode: ASDisplayNode { override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { if let event = event { var eventIsPresses = false - if #available(iOSApplicationExtension 9.0, *) { + if #available(iOSApplicationExtension 9.0, iOS 9.0, *) { eventIsPresses = event.type == .presses } if event.type == .touches || eventIsPresses { diff --git a/submodules/Display/Display/GenerateImage.swift b/submodules/Display/Display/GenerateImage.swift index b77f26efdb..218ade29c5 100644 --- a/submodules/Display/Display/GenerateImage.swift +++ b/submodules/Display/Display/GenerateImage.swift @@ -3,7 +3,7 @@ import UIKit import Accelerate public let deviceColorSpace: CGColorSpace = { - if #available(iOSApplicationExtension 9.3, *) { + if #available(iOSApplicationExtension 9.3, iOS 9.3, *) { if let colorSpace = CGColorSpace(name: CGColorSpace.displayP3) { return colorSpace } else { diff --git a/submodules/Display/Display/GridNodeScroller.swift b/submodules/Display/Display/GridNodeScroller.swift index cbd6801478..22a778f6e8 100644 --- a/submodules/Display/Display/GridNodeScroller.swift +++ b/submodules/Display/Display/GridNodeScroller.swift @@ -14,7 +14,7 @@ private class GridNodeScrollerView: UIScrollView { override init(frame: CGRect) { super.init(frame: frame) - if #available(iOSApplicationExtension 11.0, *) { + if #available(iOSApplicationExtension 11.0, iOS 11.0, *) { self.contentInsetAdjustmentBehavior = .never } } diff --git a/submodules/Display/Display/HapticFeedback.swift b/submodules/Display/Display/HapticFeedback.swift index d5ba9c885c..e0c135f16a 100644 --- a/submodules/Display/Display/HapticFeedback.swift +++ b/submodules/Display/Display/HapticFeedback.swift @@ -103,7 +103,7 @@ public final class HapticFeedback { deinit { let impl = self.impl DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 1.0, execute: { - if #available(iOSApplicationExtension 10.0, *) { + if #available(iOSApplicationExtension 10.0, iOS 10.0, *) { if let impl = impl as? HapticFeedbackImpl { impl.f() } @@ -120,7 +120,7 @@ public final class HapticFeedback { } public func prepareTap() { - if #available(iOSApplicationExtension 10.0, *) { + if #available(iOSApplicationExtension 10.0, iOS 10.0, *) { self.withImpl { impl in impl.prepareTap() } @@ -128,7 +128,7 @@ public final class HapticFeedback { } public func tap() { - if #available(iOSApplicationExtension 10.0, *) { + if #available(iOSApplicationExtension 10.0, iOS 10.0, *) { self.withImpl { impl in impl.tap() } @@ -136,7 +136,7 @@ public final class HapticFeedback { } public func prepareImpact(_ style: ImpactHapticFeedbackStyle = .medium) { - if #available(iOSApplicationExtension 10.0, *) { + if #available(iOSApplicationExtension 10.0, iOS 10.0, *) { self.withImpl { impl in impl.prepareImpact(style) } @@ -144,7 +144,7 @@ public final class HapticFeedback { } public func impact(_ style: ImpactHapticFeedbackStyle = .medium) { - if #available(iOSApplicationExtension 10.0, *) { + if #available(iOSApplicationExtension 10.0, iOS 10.0, *) { self.withImpl { impl in impl.impact(style) } @@ -152,7 +152,7 @@ public final class HapticFeedback { } public func success() { - if #available(iOSApplicationExtension 10.0, *) { + if #available(iOSApplicationExtension 10.0, iOS 10.0, *) { self.withImpl { impl in impl.success() } @@ -160,7 +160,7 @@ public final class HapticFeedback { } public func prepareError() { - if #available(iOSApplicationExtension 10.0, *) { + if #available(iOSApplicationExtension 10.0, iOS 10.0, *) { self.withImpl { impl in impl.prepareError() } @@ -168,7 +168,7 @@ public final class HapticFeedback { } public func error() { - if #available(iOSApplicationExtension 10.0, *) { + if #available(iOSApplicationExtension 10.0, iOS 10.0, *) { self.withImpl { impl in impl.error() } diff --git a/submodules/Display/Display/KeyShortcut.swift b/submodules/Display/Display/KeyShortcut.swift index ef00181595..4687d9b23d 100644 --- a/submodules/Display/Display/KeyShortcut.swift +++ b/submodules/Display/Display/KeyShortcut.swift @@ -30,7 +30,7 @@ extension UIKeyModifierFlags: Hashable { extension KeyShortcut { var uiKeyCommand: UIKeyCommand { - if #available(iOSApplicationExtension 9.0, *), !self.title.isEmpty { + if #available(iOSApplicationExtension 9.0, iOS 9.0, *), !self.title.isEmpty { return UIKeyCommand(input: self.input, modifierFlags: self.modifiers, action: #selector(KeyShortcutsController.handleKeyCommand(_:)), discoverabilityTitle: self.title) } else { return UIKeyCommand(input: self.input, modifierFlags: self.modifiers, action: #selector(KeyShortcutsController.handleKeyCommand(_:))) diff --git a/submodules/Display/Display/KeyShortcutsController.swift b/submodules/Display/Display/KeyShortcutsController.swift index c6984d775e..c276aacbb2 100644 --- a/submodules/Display/Display/KeyShortcutsController.swift +++ b/submodules/Display/Display/KeyShortcutsController.swift @@ -9,7 +9,7 @@ public class KeyShortcutsController: UIResponder { private var viewControllerEnumerator: ((ContainableController) -> Bool) -> Void public static var isAvailable: Bool { - if #available(iOSApplicationExtension 8.0, *), UIDevice.current.userInterfaceIdiom == .pad { + if #available(iOSApplicationExtension 8.0, iOS 8.0, *), UIDevice.current.userInterfaceIdiom == .pad { return true } else { return false diff --git a/submodules/Display/Display/Keyboard.swift b/submodules/Display/Display/Keyboard.swift index 44526b8f1d..912cd8fb44 100644 --- a/submodules/Display/Display/Keyboard.swift +++ b/submodules/Display/Display/Keyboard.swift @@ -1,9 +1,5 @@ import Foundation -#if BUCK -import DisplayPrivate -#endif - public enum Keyboard { public static func applyAutocorrection() { applyKeyboardAutocorrection() diff --git a/submodules/Display/Display/KeyboardManager.swift b/submodules/Display/Display/KeyboardManager.swift index 086f578ea0..f68cdc7b37 100644 --- a/submodules/Display/Display/KeyboardManager.swift +++ b/submodules/Display/Display/KeyboardManager.swift @@ -2,10 +2,6 @@ import Foundation import UIKit import AsyncDisplayKit -#if BUCK -import DisplayPrivate -#endif - struct KeyboardSurface { let host: UIView } diff --git a/submodules/Display/Display/LegacyPresentedController.swift b/submodules/Display/Display/LegacyPresentedController.swift index d0b8308e2e..6403a8088a 100644 --- a/submodules/Display/Display/LegacyPresentedController.swift +++ b/submodules/Display/Display/LegacyPresentedController.swift @@ -2,10 +2,6 @@ import Foundation import UIKit import AsyncDisplayKit -#if BUCK -import DisplayPrivate -#endif - public enum LegacyPresentedControllerPresentation { case custom case modal diff --git a/submodules/Display/Display/ListView.swift b/submodules/Display/Display/ListView.swift index 18e06e8c95..480f5db595 100644 --- a/submodules/Display/Display/ListView.swift +++ b/submodules/Display/Display/ListView.swift @@ -2,10 +2,6 @@ import UIKit import AsyncDisplayKit import SwiftSignalKit -#if BUCK -import DisplayPrivate -#endif - private let infiniteScrollSize: CGFloat = 10000.0 private let insertionAnimationDuration: Double = 0.4 diff --git a/submodules/Display/Display/ListViewAnimation.swift b/submodules/Display/Display/ListViewAnimation.swift index 18107a64c2..ec321c5d25 100644 --- a/submodules/Display/Display/ListViewAnimation.swift +++ b/submodules/Display/Display/ListViewAnimation.swift @@ -1,10 +1,6 @@ import Foundation import UIKit -#if BUCK -import DisplayPrivate -#endif - public protocol Interpolatable { static func interpolator() -> (Interpolatable, Interpolatable, CGFloat) -> (Interpolatable) } diff --git a/submodules/Display/Display/ListViewItemHeader.swift b/submodules/Display/Display/ListViewItemHeader.swift index 17bd083862..1cd37cd72d 100644 --- a/submodules/Display/Display/ListViewItemHeader.swift +++ b/submodules/Display/Display/ListViewItemHeader.swift @@ -2,10 +2,6 @@ import Foundation import UIKit import AsyncDisplayKit -#if BUCK -import DisplayPrivate -#endif - public enum ListViewItemHeaderStickDirection { case top case bottom diff --git a/submodules/Display/Display/ListViewItemNode.swift b/submodules/Display/Display/ListViewItemNode.swift index a19c7370b7..176edea1d0 100644 --- a/submodules/Display/Display/ListViewItemNode.swift +++ b/submodules/Display/Display/ListViewItemNode.swift @@ -3,10 +3,6 @@ import UIKit import AsyncDisplayKit import SwiftSignalKit -#if BUCK -import DisplayPrivate -#endif - var testSpringFrictionLimits: (CGFloat, CGFloat) = (3.0, 60.0) var testSpringFriction: CGFloat = 31.8211269378662 diff --git a/submodules/Display/Display/ListViewScroller.swift b/submodules/Display/Display/ListViewScroller.swift index fe133f920e..dd8c2f9e75 100644 --- a/submodules/Display/Display/ListViewScroller.swift +++ b/submodules/Display/Display/ListViewScroller.swift @@ -6,7 +6,7 @@ class ListViewScroller: UIScrollView, UIGestureRecognizerDelegate { #if os(iOS) self.scrollsToTop = false - if #available(iOSApplicationExtension 11.0, *) { + if #available(iOSApplicationExtension 11.0, iOS 11.0, *) { self.contentInsetAdjustmentBehavior = .never } #endif diff --git a/submodules/Display/Display/NativeWindowHostView.swift b/submodules/Display/Display/NativeWindowHostView.swift index 70b98bdcc9..11fd4ed671 100644 --- a/submodules/Display/Display/NativeWindowHostView.swift +++ b/submodules/Display/Display/NativeWindowHostView.swift @@ -77,7 +77,7 @@ private final class WindowRootViewController: UIViewController, UIViewController var gestureEdges: UIRectEdge = [] { didSet { if oldValue != self.gestureEdges { - if #available(iOSApplicationExtension 11.0, *) { + if #available(iOSApplicationExtension 11.0, iOS 11.0, *) { self.setNeedsUpdateOfScreenEdgesDeferringSystemGestures() } } @@ -87,7 +87,7 @@ private final class WindowRootViewController: UIViewController, UIViewController var preferNavigationUIHidden: Bool = false { didSet { if oldValue != self.preferNavigationUIHidden { - if #available(iOSApplicationExtension 11.0, *) { + if #available(iOSApplicationExtension 11.0, iOS 11.0, *) { self.setNeedsUpdateOfHomeIndicatorAutoHidden() } } @@ -111,7 +111,7 @@ private final class WindowRootViewController: UIViewController, UIViewController self.extendedLayoutIncludesOpaqueBars = true - if #available(iOSApplicationExtension 11.0, *) { + if #available(iOSApplicationExtension 11.0, iOS 11.0, *) { self.voiceOverStatusObserver = NotificationCenter.default.addObserver(forName: UIAccessibility.voiceOverStatusDidChangeNotification, object: nil, queue: OperationQueue.main, using: { [weak self] _ in if let strongSelf = self { strongSelf.updatePreviewingRegistration() @@ -159,7 +159,7 @@ private final class WindowRootViewController: UIViewController, UIViewController var shouldRegister = false var isVoiceOverRunning = false - if #available(iOSApplicationExtension 10.0, *) { + if #available(iOSApplicationExtension 10.0, iOS 10.0, *) { isVoiceOverRunning = UIAccessibility.isVoiceOverRunning } if !isVoiceOverRunning { @@ -169,13 +169,13 @@ private final class WindowRootViewController: UIViewController, UIViewController if shouldRegister != self.registeredForPreviewing { self.registeredForPreviewing = shouldRegister if shouldRegister { - if #available(iOSApplicationExtension 9.0, *) { + if #available(iOSApplicationExtension 9.0, iOS 9.0, *) { self.previewingContext = self.registerForPreviewing(with: self, sourceView: self.view) } } else if let previewingContext = self.previewingContext { self.previewingContext = nil if let previewingContext = previewingContext as? UIViewControllerPreviewing { - if #available(iOSApplicationExtension 9.0, *) { + if #available(iOSApplicationExtension 9.0, iOS 9.0, *) { self.unregisterForPreviewing(withContext: previewingContext) } } @@ -189,7 +189,7 @@ private final class WindowRootViewController: UIViewController, UIViewController if UIAccessibility.isVoiceOverRunning { return nil } - if #available(iOSApplicationExtension 9.0, *) { + if #available(iOSApplicationExtension 9.0, iOS 9.0, *) { guard let result = self.view.hitTest(location, with: nil) else { return nil } @@ -205,7 +205,7 @@ private final class WindowRootViewController: UIViewController, UIViewController } public func previewingContext(_ previewingContext: UIViewControllerPreviewing, commit viewControllerToCommit: UIViewController) { - if #available(iOSApplicationExtension 9.0, *) { + if #available(iOSApplicationExtension 9.0, iOS 9.0, *) { if let previousPreviewingHostView = self.previousPreviewingHostView, let delegate = previousPreviewingHostView.previewingDelegate { delegate.commitController(viewControllerToCommit) } @@ -237,7 +237,7 @@ private final class NativeWindow: UIWindow, WindowHost { let sizeUpdated = super.frame.size != value.size var frameTransition: ContainedViewLayoutTransition = .immediate - if #available(iOSApplicationExtension 9.0, *) { + if #available(iOSApplicationExtension 9.0, iOS 9.0, *) { let duration = UIView.inheritedAnimationDuration if !duration.isZero { frameTransition = .animated(duration: duration, curve: .easeInOut) diff --git a/submodules/Display/Display/NavigationController.swift b/submodules/Display/Display/NavigationController.swift index 616e7dc6fa..a8d084e3d2 100644 --- a/submodules/Display/Display/NavigationController.swift +++ b/submodules/Display/Display/NavigationController.swift @@ -3,10 +3,6 @@ import UIKit import AsyncDisplayKit import SwiftSignalKit -#if BUCK -import DisplayPrivate -#endif - public final class NavigationControllerTheme { public let navigationBar: NavigationBarTheme public let emptyAreaColor: UIColor @@ -781,7 +777,7 @@ open class NavigationController: UINavigationController, ContainableController, self.controllerView.backgroundColor = self.theme.emptyAreaColor self.controllerView.separatorView.backgroundColor = theme.navigationBar.separatorColor - if #available(iOSApplicationExtension 11.0, *) { + if #available(iOSApplicationExtension 11.0, iOS 11.0, *) { self.navigationBar.prefersLargeTitles = false } self.navigationBar.removeFromSuperview() diff --git a/submodules/Display/Display/PeekControllerGestureRecognizer.swift b/submodules/Display/Display/PeekControllerGestureRecognizer.swift index 505c039ee7..a13fe7a991 100644 --- a/submodules/Display/Display/PeekControllerGestureRecognizer.swift +++ b/submodules/Display/Display/PeekControllerGestureRecognizer.swift @@ -184,7 +184,7 @@ public final class PeekControllerGestureRecognizer: UIPanGestureRecognizer { (presentedController.displayNode as? PeekControllerNode)?.applyDraggingOffset(offset) } case .press: - if #available(iOSApplicationExtension 9.0, *) { + if #available(iOSApplicationExtension 9.0, iOS 9.0, *) { if touch.force >= 2.5 { if presentedController.isNodeLoaded { (presentedController.displayNode as? PeekControllerNode)?.activateMenu() @@ -275,7 +275,7 @@ public final class PeekControllerGestureRecognizer: UIPanGestureRecognizer { case .drag: break case .press: - if #available(iOSApplicationExtension 9.0, *) { + if #available(iOSApplicationExtension 9.0, iOS 9.0, *) { if presentedController.traitCollection.forceTouchCapability != .available { strongSelf.startPressTimer() } diff --git a/submodules/Display/Display/ScrollToTopProxyView.swift b/submodules/Display/Display/ScrollToTopProxyView.swift index 3433b8b88f..1544e0d027 100644 --- a/submodules/Display/Display/ScrollToTopProxyView.swift +++ b/submodules/Display/Display/ScrollToTopProxyView.swift @@ -8,7 +8,7 @@ class ScrollToTopView: UIScrollView, UIScrollViewDelegate { self.delegate = self self.scrollsToTop = true - if #available(iOSApplicationExtension 11.0, *) { + if #available(iOSApplicationExtension 11.0, iOS 11.0, *) { self.contentInsetAdjustmentBehavior = .never } } diff --git a/submodules/Display/Display/StatusBar.swift b/submodules/Display/Display/StatusBar.swift index 7fa7814950..f0e1ae3462 100644 --- a/submodules/Display/Display/StatusBar.swift +++ b/submodules/Display/Display/StatusBar.swift @@ -2,10 +2,6 @@ import Foundation import UIKit import AsyncDisplayKit -#if BUCK -import DisplayPrivate -#endif - public class StatusBarSurface { var statusBars: [StatusBar] = [] diff --git a/submodules/Display/Display/TabBarNode.swift b/submodules/Display/Display/TabBarNode.swift index 9e2f37fda4..8184d25be7 100644 --- a/submodules/Display/Display/TabBarNode.swift +++ b/submodules/Display/Display/TabBarNode.swift @@ -3,10 +3,6 @@ import UIKit import AsyncDisplayKit import SwiftSignalKit -#if BUCK -import DisplayPrivate -#endif - private let separatorHeight: CGFloat = 1.0 / UIScreen.main.scale private func tabBarItemImage(_ image: UIImage?, title: String, backgroundColor: UIColor, tintColor: UIColor, horizontal: Bool, imageMode: Bool) -> (UIImage, CGFloat) { let font = horizontal ? Font.regular(13.0) : Font.medium(10.0) diff --git a/submodules/Display/Display/TooltipControllerNode.swift b/submodules/Display/Display/TooltipControllerNode.swift index b9fabbc225..8d16192b42 100644 --- a/submodules/Display/Display/TooltipControllerNode.swift +++ b/submodules/Display/Display/TooltipControllerNode.swift @@ -121,7 +121,7 @@ final class TooltipControllerNode: ASDisplayNode { override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { if let event = event { var eventIsPresses = false - if #available(iOSApplicationExtension 9.0, *) { + if #available(iOSApplicationExtension 9.0, iOS 9.0, *) { eventIsPresses = event.type == .presses } if event.type == .touches || eventIsPresses { diff --git a/submodules/Display/Display/UITracingLayerView.swift b/submodules/Display/Display/UITracingLayerView.swift index 4949f056b9..8a68530dea 100644 --- a/submodules/Display/Display/UITracingLayerView.swift +++ b/submodules/Display/Display/UITracingLayerView.swift @@ -2,10 +2,6 @@ import Foundation import UIKit import AsyncDisplayKit -#if BUCK -import DisplayPrivate -#endif - open class UITracingLayerView: UIView { private var scheduledWithLayout: (() -> Void)? diff --git a/submodules/Display/Display/ViewController.swift b/submodules/Display/Display/ViewController.swift index 3d7dc74efb..a9705c506a 100644 --- a/submodules/Display/Display/ViewController.swift +++ b/submodules/Display/Display/ViewController.swift @@ -3,10 +3,6 @@ import UIKit import AsyncDisplayKit import SwiftSignalKit -#if BUCK -import DisplayPrivate -#endif - private func findCurrentResponder(_ view: UIView) -> UIResponder? { if view.isFirstResponder { return view diff --git a/submodules/Display/Display/WindowContent.swift b/submodules/Display/Display/WindowContent.swift index 181fd6f4ca..382474b229 100644 --- a/submodules/Display/Display/WindowContent.swift +++ b/submodules/Display/Display/WindowContent.swift @@ -3,10 +3,6 @@ import UIKit import AsyncDisplayKit import SwiftSignalKit -#if BUCK -import DisplayPrivate -#endif - private struct WindowLayout: Equatable { let size: CGSize let metrics: LayoutMetrics @@ -248,7 +244,7 @@ public final class WindowHostView { } var hasOnScreenNavigation: Bool { - if #available(iOSApplicationExtension 11.0, *) { + if #available(iOSApplicationExtension 11.0, iOS 11.0, *) { return !self.eventView.safeAreaInsets.bottom.isZero } else { return false @@ -514,7 +510,7 @@ public class Window1 { } }) - if #available(iOSApplicationExtension 11.0, *) { + if #available(iOSApplicationExtension 11.0, iOS 11.0, *) { self.keyboardTypeChangeObserver = NotificationCenter.default.addObserver(forName: UITextInputMode.currentInputModeDidChangeNotification, object: nil, queue: OperationQueue.main, using: { [weak self] notification in if let strongSelf = self, let initialInputHeight = strongSelf.windowLayout.inputHeight, let firstResponder = getFirstResponderAndAccessoryHeight(strongSelf.hostView.eventView).0 { if firstResponder.textInputMode?.primaryLanguage != nil { @@ -542,7 +538,7 @@ public class Window1 { }) } - if #available(iOSApplicationExtension 11.0, *) { + if #available(iOSApplicationExtension 11.0, iOS 11.0, *) { self.voiceOverStatusObserver = NotificationCenter.default.addObserver(forName: UIAccessibility.voiceOverStatusDidChangeNotification, object: nil, queue: OperationQueue.main, using: { [weak self] _ in if let strongSelf = self { strongSelf.updateLayout { $0.update(inVoiceOver: UIAccessibility.isVoiceOverRunning) } diff --git a/submodules/Emoji/BUCK b/submodules/Emoji/BUCK index 7fdf3a58b9..3842502ed0 100644 --- a/submodules/Emoji/BUCK +++ b/submodules/Emoji/BUCK @@ -1,16 +1,6 @@ -load("//Config:buck_rule_macros.bzl", "static_library", "framework") +load("//Config:buck_rule_macros.bzl", "static_library") -apple_resource( - name = 'EmojiFiles', - dirs = [ - "TestFolder.bundle", - ], - visibility = [ - "PUBLIC", - ], -) - -framework( +static_library( name = "Emoji", srcs = glob([ "Sources/*.swift", diff --git a/submodules/EncryptionKeyVisualization/BUCK b/submodules/EncryptionKeyVisualization/BUCK new file mode 100644 index 0000000000..438d1d59ee --- /dev/null +++ b/submodules/EncryptionKeyVisualization/BUCK @@ -0,0 +1,21 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "EncryptionKeyVisualization", + srcs = glob([ + "Sources/*.m", + ]), + headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/EncryptionKeyVisualization.h"]), + exported_headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/EncryptionKeyVisualization.h"]), + deps = [ + "//submodules/TelegramCore:TelegramCore#shared", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/GZip/BUCK b/submodules/GZip/BUCK new file mode 100644 index 0000000000..e15e4b1bd4 --- /dev/null +++ b/submodules/GZip/BUCK @@ -0,0 +1,17 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "GZip", + srcs = glob([ + "Sources/*.m", + ]), + headers = glob([ + "Sources/*.h", + ]), + exported_headers = glob([ + "Sources/*.h", + ]), + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/Geocoding/BUCK b/submodules/Geocoding/BUCK new file mode 100644 index 0000000000..12b222d7f0 --- /dev/null +++ b/submodules/Geocoding/BUCK @@ -0,0 +1,15 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "Geocoding", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/CoreLocation.framework", + ], +) diff --git a/submodules/HexColor/BUCK b/submodules/HexColor/BUCK new file mode 100644 index 0000000000..9753c4f5b6 --- /dev/null +++ b/submodules/HexColor/BUCK @@ -0,0 +1,12 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "HexColor", + srcs = glob([ + "Sources/*.swift", + ]), + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/HockeySDK-iOS/BUCK b/submodules/HockeySDK-iOS/BUCK new file mode 100644 index 0000000000..875c744d1e --- /dev/null +++ b/submodules/HockeySDK-iOS/BUCK @@ -0,0 +1,58 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +prebuilt_apple_framework( + name = "CrashReporter", + framework = "Vendor/CrashReporter.framework", + preferred_linkage = "static", +) + +static_library( + name = "HockeySDK", + srcs = glob([ + "Classes/*.m", + "Classes/*.mm", + ]), + headers = glob([ + "Classes/*.h", + ]), + exported_headers = [ + "Classes/HockeySDKFeatureConfig.h", + "Classes/HockeySDKEnums.h", + "Classes/HockeySDKNullability.h", + "Classes/BITAlertAction.h", + + "Classes/BITHockeyManager.h", + + "Classes/BITHockeyAttachment.h", + + "Classes/BITHockeyBaseManager.h", + "Classes/BITCrashManager.h", + "Classes/BITCrashAttachment.h", + "Classes/BITCrashManagerDelegate.h", + "Classes/BITCrashDetails.h", + "Classes/BITCrashMetaData.h", + + "Classes/BITUpdateManager.h", + "Classes/BITUpdateManagerDelegate.h", + "Classes/BITUpdateViewController.h", + "Classes/BITHockeyBaseViewController.h", + "Classes/BITHockeyManagerDelegate.h", + ], + compiler_flags = [ + '-DBITHOCKEY_VERSION=@\"5.1.2\"', + '-DBITHOCKEY_C_VERSION="5.1.2"', + '-DBITHOCKEY_C_BUILD="108"', + "-DHOCKEYSDK_FEATURE_CRASH_REPORTER=1", + "-DHOCKEYSDK_FEATURE_UPDATES=1", + "-DHOCKEYSDK_FEATURE_FEEDBACK=0", + "-DHOCKEYSDK_FEATURE_AUTHENTICATOR=0", + "-DHOCKEYSDK_FEATURE_METRICS=0", + ], + deps = [ + ":CrashReporter", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) \ No newline at end of file diff --git a/submodules/ImageBlur/BUCK b/submodules/ImageBlur/BUCK new file mode 100644 index 0000000000..8c43d100bd --- /dev/null +++ b/submodules/ImageBlur/BUCK @@ -0,0 +1,20 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "ImageBlur", + srcs = glob([ + "Sources/*.swift", + "Sources/*.m", + ]), + headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/ImageBlur.h"]), + exported_headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/ImageBlur.h"]), + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + "$SDKROOT/System/Library/Frameworks/Accelerate.framework", + ], +) diff --git a/submodules/ImageCompression/BUCK b/submodules/ImageCompression/BUCK new file mode 100644 index 0000000000..305b778170 --- /dev/null +++ b/submodules/ImageCompression/BUCK @@ -0,0 +1,13 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "ImageCompression", + srcs = glob([ + "Sources/*.swift", + ]), + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + "$SDKROOT/System/Library/Frameworks/AVFoundation.framework", + ], +) diff --git a/submodules/ImageTransparency/BUCK b/submodules/ImageTransparency/BUCK new file mode 100644 index 0000000000..2f88df0925 --- /dev/null +++ b/submodules/ImageTransparency/BUCK @@ -0,0 +1,16 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "ImageTransparency", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/Display:Display#shared", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + "$SDKROOT/System/Library/Frameworks/Accelerate.framework", + ], +) diff --git a/submodules/InstantPageCache/BUCK b/submodules/InstantPageCache/BUCK new file mode 100644 index 0000000000..d1a506c7f0 --- /dev/null +++ b/submodules/InstantPageCache/BUCK @@ -0,0 +1,19 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "InstantPageCache", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/Postbox:Postbox#shared", + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/TelegramUIPreferences:TelegramUIPreferences", + "//submodules/PersistentStringHash:PersistentStringHash", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/LegacyComponents/BUCK b/submodules/LegacyComponents/BUCK new file mode 100644 index 0000000000..ce5591c36f --- /dev/null +++ b/submodules/LegacyComponents/BUCK @@ -0,0 +1,366 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +apple_resource( + name = "LegacyComponentsResources", + dirs = [ + "LegacyComponents/Resources/LegacyComponentsResources.bundle", + ], +) + +static_library( + name = "LegacyComponents", + srcs = glob([ + "LegacyComponents/*.m", + "LegacyComponents/*.mm", + "LegacyComponents/*.c", + "LegacyComponents/*.cpp", + ]), + headers = glob([ + "LegacyComponents/*.h", + ], exclude = ["LegacyComponents/LegacyComponents.h"]), + exported_headers = [ + "LegacyComponents/LegacyComponentsGlobals.h", + "LegacyComponents/LegacyComponentsContext.h", + "LegacyComponents/TGLocalization.h", + "LegacyComponents/TGPluralization.h", + "LegacyComponents/TGStringUtils.h", + "LegacyComponents/TGPhoneUtils.h", + "LegacyComponents/NSObject+TGLock.h", + "LegacyComponents/RMPhoneFormat.h", + "LegacyComponents/NSInputStream+TL.h", + "LegacyComponents/TGFont.h", + "LegacyComponents/TGImageUtils.h", + "LegacyComponents/TGDateUtils.h", + "LegacyComponents/Freedom.h", + "LegacyComponents/FreedomUIKit.h", + "LegacyComponents/TGHacks.h", + "LegacyComponents/TGImageBlur.h", + "LegacyComponents/UIDevice+PlatformInfo.h", + "LegacyComponents/TGObserverProxy.h", + "LegacyComponents/TGModernCache.h", + "LegacyComponents/TGMemoryImageCache.h", + "LegacyComponents/LegacyComponentsAccessChecker.h", + "LegacyComponents/TGTimerTarget.h", + "LegacyComponents/TGKeyCommand.h", + "LegacyComponents/TGKeyCommandController.h", + "LegacyComponents/TGWeakDelegate.h", + "LegacyComponents/TGCache.h", + "LegacyComponents/TGLiveUploadInterface.h", + + "LegacyComponents/JNWSpringAnimation.h", + "LegacyComponents/POPAnimationEvent.h", + "LegacyComponents/POPAnimationTracer.h", + "LegacyComponents/POPAnimation.h", + "LegacyComponents/POPBasicAnimation.h", + "LegacyComponents/POPCustomAnimation.h", + "LegacyComponents/POPDecayAnimation.h", + "LegacyComponents/POPPropertyAnimation.h", + "LegacyComponents/POPSpringAnimation.h", + "LegacyComponents/POPGeometry.h", + "LegacyComponents/POPAnimatableProperty.h", + + "LegacyComponents/lmdb.h", + "LegacyComponents/PSLMDBTable.h", + "LegacyComponents/PSLMDBKeyValueStore.h", + "LegacyComponents/PSLMDBKeyValueReaderWriter.h", + "LegacyComponents/PSLMDBKeyValueCursor.h", + + "LegacyComponents/PSCoding.h", + "LegacyComponents/PSData.h", + "LegacyComponents/PSKeyValueCoder.h", + "LegacyComponents/PSKeyValueDecoder.h", + "LegacyComponents/PSKeyValueEncoder.h", + "LegacyComponents/PSKeyValueReader.h", + "LegacyComponents/PSKeyValueStore.h", + "LegacyComponents/PSKeyValueWriter.h", + + "LegacyComponents/TGPeerIdAdapter.h", + "LegacyComponents/TGUser.h", + "LegacyComponents/TGBotInfo.h", + "LegacyComponents/TGBotComandInfo.h", + "LegacyComponents/TGConversation.h", + + "LegacyComponents/TGModernConversationAssociatedInputPanel.h", + "LegacyComponents/TGModernConversationHashtagsAssociatedPanel.h", + "LegacyComponents/TGModernConversationMentionsAssociatedPanel.h", + "LegacyComponents/TGModernConversationAlphacodeAssociatedPanel.h", + "LegacyComponents/TGSuggestionContext.h", + "LegacyComponents/TGAlphacode.h", + + "LegacyComponents/TGTextCheckingResult.h", + "LegacyComponents/TGChannelBannedRights.h", + "LegacyComponents/TGChannelAdminRights.h", + "LegacyComponents/TGDatabaseMessageDraft.h", + "LegacyComponents/TGMessageGroup.h", + "LegacyComponents/TGMessageHole.h", + "LegacyComponents/TGMessageViewCountContentProperty.h", + "LegacyComponents/TGAuthorSignatureMediaAttachment.h", + "LegacyComponents/TGWebDocument.h", + "LegacyComponents/TGInvoiceMediaAttachment.h", + "LegacyComponents/TGGameMediaAttachment.h", + "LegacyComponents/TGViaUserAttachment.h", + "LegacyComponents/TGBotContextResultAttachment.h", + "LegacyComponents/TGMessageEntity.h", + "LegacyComponents/TGMessageEntityBold.h", + "LegacyComponents/TGMessageEntityBotCommand.h", + "LegacyComponents/TGMessageEntityCode.h", + "LegacyComponents/TGMessageEntityEmail.h", + "LegacyComponents/TGMessageEntityHashtag.h", + "LegacyComponents/TGMessageEntityItalic.h", + "LegacyComponents/TGMessageEntityMention.h", + "LegacyComponents/TGMessageEntityMentionName.h", + "LegacyComponents/TGMessageEntityPre.h", + "LegacyComponents/TGMessageEntityTextUrl.h", + "LegacyComponents/TGMessageEntityUrl.h", + "LegacyComponents/TGMessageEntitiesAttachment.h", + "LegacyComponents/TGBotReplyMarkup.h", + "LegacyComponents/TGBotReplyMarkupButton.h", + "LegacyComponents/TGBotReplyMarkupRow.h", + "LegacyComponents/TGReplyMarkupAttachment.h", + "LegacyComponents/TGInstantPage.h", + "LegacyComponents/TGWebPageMediaAttachment.h", + "LegacyComponents/TGAudioMediaAttachment.h", + "LegacyComponents/TGAudioWaveform.h", + "LegacyComponents/TGStickerPackReference.h", + "LegacyComponents/TGDocumentAttributeFilename.h", + "LegacyComponents/TGDocumentAttributeImageSize.h", + "LegacyComponents/TGDocumentAttributeSticker.h", + "LegacyComponents/TGDocumentAttributeVideo.h", + "LegacyComponents/TGDocumentAttributeAnimated.h", + "LegacyComponents/TGDocumentAttributeAudio.h", + "LegacyComponents/TGDocumentMediaAttachment.h", + "LegacyComponents/TGUnsupportedMediaAttachment.h", + "LegacyComponents/TGForwardedMessageMediaAttachment.h", + "LegacyComponents/TGContactMediaAttachment.h", + "LegacyComponents/TGVideoInfo.h", + "LegacyComponents/TGVideoMediaAttachment.h", + "LegacyComponents/TGLocalMessageMetaMediaAttachment.h", + "LegacyComponents/TGLocationMediaAttachment.h", + "LegacyComponents/TGImageMediaAttachment.h", + "LegacyComponents/TGMediaAttachment.h", + "LegacyComponents/TGImageInfo.h", + "LegacyComponents/TGMediaOriginInfo.h", + "LegacyComponents/TGMessage.h", + "LegacyComponents/TGStickerPack.h", + "LegacyComponents/TGStickerAssociation.h", + "LegacyComponents/TGPhotoMaskPosition.h", + + "LegacyComponents/ActionStage.h", + "LegacyComponents/ASActor.h", + "LegacyComponents/ASHandle.h", + "LegacyComponents/ASQueue.h", + "LegacyComponents/ASWatcher.h", + "LegacyComponents/SGraphListNode.h", + "LegacyComponents/SGraphNode.h", + "LegacyComponents/SGraphObjectNode.h", + + "LegacyComponents/TGLabel.h", + "LegacyComponents/TGToolbarButton.h", + "LegacyComponents/UIScrollView+TGHacks.h", + "LegacyComponents/TGAnimationBlockDelegate.h", + "LegacyComponents/TGBackdropView.h", + "LegacyComponents/UIImage+TG.h", + "LegacyComponents/TGStaticBackdropAreaData.h", + "LegacyComponents/TGStaticBackdropImageData.h", + "LegacyComponents/TGImageLuminanceMap.h", + "LegacyComponents/TGFullscreenContainerView.h", + "LegacyComponents/TGDoubleTapGestureRecognizer.h", + "LegacyComponents/TGModernButton.h", + "LegacyComponents/TGModernToolbarButton.h", + "LegacyComponents/TGModernBackToolbarButton.h", + "LegacyComponents/UIControl+HitTestEdgeInsets.h", + "LegacyComponents/TGMenuView.h", + "LegacyComponents/TGImageView.h", + "LegacyComponents/UICollectionView+Utils.h", + "LegacyComponents/TGMessageImageViewOverlayView.h", + "LegacyComponents/TGLetteredAvatarView.h", + "LegacyComponents/TGGradientLabel.h", + "LegacyComponents/TGRemoteImageView.h", + + "LegacyComponents/TGProgressSpinnerView.h", + "LegacyComponents/TGProgressWindow.h", + + "LegacyComponents/TGMenuSheetController.h", + "LegacyComponents/TGMenuSheetButtonItemView.h", + "LegacyComponents/TGMenuSheetCollectionView.h", + "LegacyComponents/TGMenuSheetItemView.h", + "LegacyComponents/TGMenuSheetTitleItemView.h", + "LegacyComponents/TGMenuSheetView.h", + + "LegacyComponents/HPGrowingTextView.h", + "LegacyComponents/HPTextViewInternal.h", + "LegacyComponents/TGInputTextTag.h", + + "LegacyComponents/TGStickerKeyboardTabPanel.h", + + "LegacyComponents/TGItemPreviewController.h", + "LegacyComponents/TGItemPreviewView.h", + "LegacyComponents/TGItemMenuSheetPreviewView.h", + + "LegacyComponents/TGImageManager.h", + "LegacyComponents/TGDataResource.h", + "LegacyComponents/TGImageDataSource.h", + "LegacyComponents/TGImageManagerTask.h", + + "LegacyComponents/TGRTLScreenEdgePanGestureRecognizer.h", + "LegacyComponents/TGPopoverController.h", + "LegacyComponents/TGNavigationController.h", + "LegacyComponents/TGNavigationBar.h", + "LegacyComponents/TGViewController.h", + "LegacyComponents/TGViewController+TGRecursiveEnumeration.h", + "LegacyComponents/TGOverlayController.h", + "LegacyComponents/TGOverlayControllerWindow.h", + + "LegacyComponents/TGMediaAssetsLibrary.h", + "LegacyComponents/TGMediaAssetsModernLibrary.h", + "LegacyComponents/TGMediaAsset.h", + "LegacyComponents/TGMediaAssetFetchResult.h", + "LegacyComponents/TGMediaAssetFetchResultChange.h", + "LegacyComponents/TGMediaAssetGroup.h", + "LegacyComponents/TGMediaAssetMoment.h", + "LegacyComponents/TGMediaAssetMomentList.h", + "LegacyComponents/TGMediaAssetImageSignals.h", + "LegacyComponents/TGMediaSelectionContext.h", + "LegacyComponents/TGMediaEditingContext.h", + + "LegacyComponents/TGModernGalleryZoomableItemViewContent.h", + "LegacyComponents/TGModernGalleryZoomableScrollView.h", + "LegacyComponents/TGModernGalleryZoomableScrollViewSwipeGestureRecognizer.h", + "LegacyComponents/TGModernGalleryVideoView.h", + "LegacyComponents/TGModernGalleryScrollView.h", + "LegacyComponents/TGModernGalleryItem.h", + "LegacyComponents/TGModernGalleryItemView.h", + "LegacyComponents/TGModernGalleryImageItem.h", + "LegacyComponents/TGModernGalleryImageItemView.h", + "LegacyComponents/TGModernGalleryImageItemImageView.h", + "LegacyComponents/TGModernGalleryEditableItemView.h", + "LegacyComponents/TGModernGallerySelectableItem.h", + "LegacyComponents/TGModernGalleryDefaultFooterAccessoryView.h", + "LegacyComponents/TGModernGalleryDefaultFooterView.h", + "LegacyComponents/TGModernGalleryDefaultHeaderView.h", + "LegacyComponents/TGModernGalleryDefaultInterfaceView.h", + "LegacyComponents/TGModernGalleryInterfaceView.h", + "LegacyComponents/TGModernGalleryImageItemContainerView.h", + "LegacyComponents/TGModernGalleryZoomableItemView.h", + "LegacyComponents/TGModernGalleryModel.h", + "LegacyComponents/TGModernGalleryTransitionView.h", + "LegacyComponents/TGModernGalleryView.h", + "LegacyComponents/TGModernGalleryContainerView.h", + "LegacyComponents/TGModernGalleryEmbeddedStickersHeaderView.h", + "LegacyComponents/TGModernGalleryController.h", + + "LegacyComponents/TGPhotoToolbarView.h", + "LegacyComponents/TGMediaPickerGalleryModel.h", + "LegacyComponents/TGMediaPickerGalleryInterfaceView.h", + "LegacyComponents/TGPhotoEditorController.h", + "LegacyComponents/TGMediaAvatarEditorTransition.h", + + "LegacyComponents/TGPhotoEditorUtils.h", + "LegacyComponents/PGPhotoEditorValues.h", + "LegacyComponents/TGVideoEditAdjustments.h", + "LegacyComponents/AVURLAsset+TGMediaItem.h", + "LegacyComponents/UIImage+TGMediaEditableItem.h", + "LegacyComponents/TGMediaVideoConverter.h", + "LegacyComponents/TGGifConverter.h", + + "LegacyComponents/TGPhotoEditorAnimation.h", + + "LegacyComponents/TGPaintingData.h", + "LegacyComponents/TGPaintUtils.h", + "LegacyComponents/TGPhotoPaintEntity.h", + "LegacyComponents/TGPhotoPaintStickerEntity.h", + "LegacyComponents/TGPaintUndoManager.h", + + "LegacyComponents/PGCamera.h", + "LegacyComponents/PGCameraCaptureSession.h", + "LegacyComponents/PGCameraDeviceAngleSampler.h", + "LegacyComponents/PGCameraMomentSegment.h", + "LegacyComponents/PGCameraMomentSession.h", + "LegacyComponents/PGCameraMovieWriter.h", + "LegacyComponents/PGCameraShotMetadata.h", + "LegacyComponents/PGCameraVolumeButtonHandler.h", + "LegacyComponents/TGCameraPreviewView.h", + "LegacyComponents/TGCameraMainPhoneView.h", + "LegacyComponents/TGCameraMainTabletView.h", + "LegacyComponents/TGCameraMainView.h", + "LegacyComponents/TGCameraFlashActiveView.h", + "LegacyComponents/TGCameraFlashControl.h", + "LegacyComponents/TGCameraFlipButton.h", + "LegacyComponents/TGCameraInterfaceAssets.h", + "LegacyComponents/TGCameraModeControl.h", + "LegacyComponents/TGCameraSegmentsView.h", + "LegacyComponents/TGCameraShutterButton.h", + "LegacyComponents/TGCameraTimeCodeView.h", + "LegacyComponents/TGCameraZoomView.h", + "LegacyComponents/TGCameraPhotoPreviewController.h", + "LegacyComponents/TGCameraController.h", + "LegacyComponents/TGCameraCapturedPhoto.h", + "LegacyComponents/TGCameraCapturedVideo.h", + "LegacyComponents/TGPhotoVideoEditor.h", + + "LegacyComponents/TGModernConversationTitleActivityIndicator.h", + "LegacyComponents/TGEmbedPIPButton.h", + "LegacyComponents/TGEmbedPIPPullArrowView.h", + "LegacyComponents/TGEmbedPlayerState.h", + "LegacyComponents/TGAttachmentCameraView.h", + "LegacyComponents/TGMediaAvatarMenuMixin.h", + "LegacyComponents/TGPassportAttachMenu.h", + "LegacyComponents/TGPassportScanController.h", + "LegacyComponents/TGPassportOCR.h", + "LegacyComponents/TGPassportMRZ.h", + "LegacyComponents/TGPassportICloud.h", + "LegacyComponents/TGEmbedPlayerView.h", + "LegacyComponents/LegacyHTTPRequestOperation.h", + + "LegacyComponents/TGAttachmentCarouselItemView.h", + "LegacyComponents/TGMediaAssetsController.h", + + "LegacyComponents/TGLocationVenue.h", + "LegacyComponents/TGLocationMapViewController.h", + "LegacyComponents/TGLocationPickerController.h", + "LegacyComponents/TGLocationViewController.h", + "LegacyComponents/TGListsTableView.h", + "LegacyComponents/TGSearchBar.h", + "LegacyComponents/TGSearchDisplayMixin.h", + + "LegacyComponents/TGPhotoEditorSliderView.h", + + "LegacyComponents/TGClipboardGalleryMixin.h", + "LegacyComponents/TGClipboardGalleryPhotoItem.h", + "LegacyComponents/TGVideoMessageCaptureController.h", + "LegacyComponents/TGModernConversationInputMicButton.h", + + "LegacyComponents/TGLocationPulseView.h", + "LegacyComponents/TGLocationWavesView.h", + "LegacyComponents/TGLocationLiveElapsedView.h", + "LegacyComponents/TGLocationLiveSessionItemView.h", + + "LegacyComponents/TGTooltipView.h", + + "LegacyComponents/TGCheckButtonView.h", + "LegacyComponents/TGClipboardMenu.h", + "LegacyComponents/TGImagePickerController.h", + "LegacyComponents/TGLegacyCameraController.h", + "LegacyComponents/TGProxyWindow.h", + "LegacyComponents/TGIconSwitchView.h", + + "LegacyComponents/TGModernGalleryEditableItem.h", + "LegacyComponents/TGPhotoEditorButton.h", + + "LegacyComponents/TGActionMediaAttachment.h", + "LegacyComponents/TGReplyMessageMediaAttachment.h", + "LegacyComponents/TGMessageEntityPhone.h", + "LegacyComponents/TGMessageEntityCashtag.h", + "LegacyComponents/TGPIPAblePlayerView.h", + "LegacyComponents/TGEmbedPlayerControls.h", + ], + deps = [ + ":LegacyComponentsResources", + "//submodules/SSignalKit/SSignalKit:SSignalKit", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + "$SDKROOT/System/Library/Frameworks/Vision.framework", + ], +) \ No newline at end of file diff --git a/submodules/LegacyDataImport/BUCK b/submodules/LegacyDataImport/BUCK new file mode 100644 index 0000000000..3a53e75b7d --- /dev/null +++ b/submodules/LegacyDataImport/BUCK @@ -0,0 +1,28 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "LegacyDataImport", + srcs = glob([ + "Sources/*.swift", + "Sources/*.m", + ]), + headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/LegacyDataImport.h"]), + exported_headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/LegacyDataImport.h"]), + deps = [ + "//submodules/TelegramCore:TelegramCore#dynamic", + "//submodules/Postbox:Postbox#dynamic", + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#dynamic", + "//submodules/TelegramNotices:TelegramNotices", + "//submodules/TelegramUIPreferences:TelegramUIPreferences", + "//submodules/RadialStatusNode:RadialStatusNode", + "//submodules/LegacyComponents:LegacyComponents", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/LightweightAccountData/BUCK b/submodules/LightweightAccountData/BUCK new file mode 100644 index 0000000000..3869439c88 --- /dev/null +++ b/submodules/LightweightAccountData/BUCK @@ -0,0 +1,11 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "LightweightAccountData", + srcs = glob([ + "Sources/*.swift", + ]), + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/LiveLocationManager/BUCK b/submodules/LiveLocationManager/BUCK new file mode 100644 index 0000000000..cdbc094a1d --- /dev/null +++ b/submodules/LiveLocationManager/BUCK @@ -0,0 +1,19 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "LiveLocationManager", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#dynamic", + "//submodules/TelegramCore:TelegramCore#dynamic", + "//submodules/Postbox:Postbox#dynamic", + "//submodules/DeviceLocationManager:DeviceLocationManager", + "//submodules/AccountContext:AccountContext", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/CoreLocation.framework", + ], +) diff --git a/submodules/LiveLocationPositionNode/BUCK b/submodules/LiveLocationPositionNode/BUCK new file mode 100644 index 0000000000..9126a65800 --- /dev/null +++ b/submodules/LiveLocationPositionNode/BUCK @@ -0,0 +1,20 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "LiveLocationPositionNode", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/AsyncDisplayKit:AsyncDisplayKit#shared", + "//submodules/Display:Display#shared", + "//submodules/Postbox:Postbox#shared", + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/TelegramPresentationData:TelegramPresentationData", + "//submodules/AvatarNode:AvatarNode", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/LiveLocationTimerNode/BUCK b/submodules/LiveLocationTimerNode/BUCK new file mode 100644 index 0000000000..62d854c775 --- /dev/null +++ b/submodules/LiveLocationTimerNode/BUCK @@ -0,0 +1,17 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "LiveLocationTimerNode", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/AsyncDisplayKit:AsyncDisplayKit#shared", + "//submodules/Display:Display#shared", + "//submodules/TelegramPresentationData:TelegramPresentationData", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/LocalAuth/BUCK b/submodules/LocalAuth/BUCK new file mode 100644 index 0000000000..1b842b5960 --- /dev/null +++ b/submodules/LocalAuth/BUCK @@ -0,0 +1,15 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "LocalAuth", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/LocalAuthentication.framework", + ], +) diff --git a/submodules/LocalMediaResources/BUCK b/submodules/LocalMediaResources/BUCK new file mode 100644 index 0000000000..cc1b92c582 --- /dev/null +++ b/submodules/LocalMediaResources/BUCK @@ -0,0 +1,19 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "LocalMediaResources", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/Postbox:Postbox#shared", + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/ImageCompression:ImageCompression", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + "$SDKROOT/System/Library/Frameworks/Photos.framework", + ], +) diff --git a/submodules/LocalizedPeerData/BUCK b/submodules/LocalizedPeerData/BUCK new file mode 100644 index 0000000000..d8ca39410e --- /dev/null +++ b/submodules/LocalizedPeerData/BUCK @@ -0,0 +1,17 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "LocalizedPeerData", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/TelegramCore:TelegramCore#dynamic", + "//submodules/Postbox:Postbox#dynamic", + "//submodules/TelegramPresentationData:TelegramPresentationData", + "//submodules/TelegramUIPreferences:TelegramUIPreferences", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/MapResourceToAvatarSizes/BUCK b/submodules/MapResourceToAvatarSizes/BUCK new file mode 100644 index 0000000000..3bc7ba9f9c --- /dev/null +++ b/submodules/MapResourceToAvatarSizes/BUCK @@ -0,0 +1,18 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "MapResourceToAvatarSizes", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/Postbox:Postbox#shared", + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/Display:Display#shared", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/MediaPlayer/BUCK b/submodules/MediaPlayer/BUCK new file mode 100644 index 0000000000..4a563946d4 --- /dev/null +++ b/submodules/MediaPlayer/BUCK @@ -0,0 +1,27 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "UniversalMediaPlayer", + srcs = glob([ + "Sources/*.swift", + "Sources/*.m", + ]), + headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/UniversalMediaPlayer.h"]), + exported_headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/UniversalMediaPlayer.h"]), + deps = [ + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/Postbox:Postbox#shared", + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/AsyncDisplayKit:AsyncDisplayKit#shared", + "//submodules/Display:Display#shared", + "//submodules/TelegramAudio:TelegramAudio", + "//submodules/FFMpeg:FFMpeg", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/MediaResources/BUCK b/submodules/MediaResources/BUCK new file mode 100644 index 0000000000..6b5acbd4ce --- /dev/null +++ b/submodules/MediaResources/BUCK @@ -0,0 +1,18 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "MediaResources", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/Postbox:Postbox#shared", + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + "$SDKROOT/System/Library/Frameworks/MapKit.framework", + ], +) diff --git a/submodules/MergeLists/BUCK b/submodules/MergeLists/BUCK new file mode 100644 index 0000000000..d380710cc0 --- /dev/null +++ b/submodules/MergeLists/BUCK @@ -0,0 +1,11 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "MergeLists", + srcs = glob([ + "Sources/*.swift", + ]), + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/MimeTypes/BUCK b/submodules/MimeTypes/BUCK new file mode 100644 index 0000000000..8508f813b6 --- /dev/null +++ b/submodules/MimeTypes/BUCK @@ -0,0 +1,17 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "MimeTypes", + srcs = glob([ + "Sources/*.m", + ]), + headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/MimeTypes.h"]), + exported_headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/MimeTypes.h"]), + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/MosaicLayout/BUCK b/submodules/MosaicLayout/BUCK new file mode 100644 index 0000000000..2914f25f74 --- /dev/null +++ b/submodules/MosaicLayout/BUCK @@ -0,0 +1,12 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "MosaicLayout", + srcs = glob([ + "Sources/*.swift", + ]), + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/MusicAlbumArtResources/BUCK b/submodules/MusicAlbumArtResources/BUCK new file mode 100644 index 0000000000..bfeb4f226d --- /dev/null +++ b/submodules/MusicAlbumArtResources/BUCK @@ -0,0 +1,18 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "MusicAlbumArtResources", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/Postbox:Postbox#shared", + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/UrlEscaping:UrlEscaping", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/Opus/BUCK b/submodules/Opus/BUCK new file mode 100644 index 0000000000..681710b9ed --- /dev/null +++ b/submodules/Opus/BUCK @@ -0,0 +1,41 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +genrule( + name = "opus_lib_file", + visibility = [ + "//submodules/Opus:..." + ], + srcs = [ + "Sources/opus/lib/libopus.a", + ], + bash = "mkdir -p $OUT; cp $SRCS $OUT/", + out = "opus_lib_file", +) + +apple_library( + name = "opus_lib", + visibility = [ + "//submodules/Opus:..." + ], + header_namespace = "opus", + exported_headers = glob([ + "Sources/**/*.h", + ]), + exported_linker_flags = [ + "-lopus", + "-L$(location :opus_lib_file)", + ], +) + +static_library( + name = "opus", + srcs = glob([ + "Sources/*.swift", + ]), + exported_headers = glob([ + "Sources/**/*.h", + ]), + deps = [ + ":opus_lib", + ], +) diff --git a/submodules/OpusBinding/BUCK b/submodules/OpusBinding/BUCK new file mode 100644 index 0000000000..acebbafd3c --- /dev/null +++ b/submodules/OpusBinding/BUCK @@ -0,0 +1,34 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "OpusBinding", + srcs = glob([ + "Sources/**/*.m", + "Sources/**/*.c", + ]), + headers = { + "ogg/ogg.h": "Sources/ogg/ogg.h", + "ogg/os_types.h": "Sources/ogg/os_types.h", + "OggOpusReader.h": "Sources/OggOpusReader.h", + "TGDataItem.h": "Sources/TGDataItem.h", + "TGOggOpusWriter.h": "Sources/TGOggOpusWriter.h", + "opusenc/diag_range.h": "Sources/opusenc/diag_range.h", + "opusenc/opus_header.h": "Sources/opusenc/opus_header.h", + "opusenc/picture.h": "Sources/opusenc/picture.h", + "opusenc/wav_io.h": "Sources/opusenc/wav_io.h", + "opusfile/internal.h": "Sources/opusfile/internal.h", + "OpusBinding/opusfile.h": "Sources/opusfile/opusfile.h", + }, + exported_headers = [ + "Sources/TGDataItem.h", + "Sources/TGOggOpusWriter.h", + "Sources/OggOpusReader.h", + ], + deps = [ + "//submodules/Opus:opus", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/Pdf/BUCK b/submodules/Pdf/BUCK new file mode 100644 index 0000000000..d1b5e5eabb --- /dev/null +++ b/submodules/Pdf/BUCK @@ -0,0 +1,15 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "Pdf", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/Display:Display#shared", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/PeerPresenceStatusManager/BUCK b/submodules/PeerPresenceStatusManager/BUCK new file mode 100644 index 0000000000..100cea932f --- /dev/null +++ b/submodules/PeerPresenceStatusManager/BUCK @@ -0,0 +1,16 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "PeerPresenceStatusManager", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/Postbox:Postbox#shared", + "//submodules/TelegramCore:TelegramCore#shared", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/PersistentStringHash/BUCK b/submodules/PersistentStringHash/BUCK new file mode 100644 index 0000000000..2346b332d3 --- /dev/null +++ b/submodules/PersistentStringHash/BUCK @@ -0,0 +1,11 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "PersistentStringHash", + srcs = glob([ + "Sources/*.swift", + ]), + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/PhotoResources/BUCK b/submodules/PhotoResources/BUCK new file mode 100644 index 0000000000..fd873255ce --- /dev/null +++ b/submodules/PhotoResources/BUCK @@ -0,0 +1,28 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "PhotoResources", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/Postbox:Postbox#shared", + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/Display:Display#shared", + "//submodules/ImageTransparency:ImageTransparency", + "//submodules/TinyThumbnail:TinyThumbnail", + "//submodules/ImageBlur:ImageBlur", + "//submodules/Tuples:Tuples", + "//submodules/AccountContext:AccountContext", + "//submodules/MediaResources:MediaResources", + "//submodules/TelegramUIPreferences:TelegramUIPreferences", + "//submodules/WebP:WebP", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + "$SDKROOT/System/Library/Frameworks/ImageIO.framework", + "$SDKROOT/System/Library/Frameworks/AVFoundation.framework", + ], +) diff --git a/submodules/PhotoResources/Sources/PhotoResources.swift b/submodules/PhotoResources/Sources/PhotoResources.swift index 5fb4f32511..c382937a40 100644 --- a/submodules/PhotoResources/Sources/PhotoResources.swift +++ b/submodules/PhotoResources/Sources/PhotoResources.swift @@ -6,11 +6,7 @@ import Display import AVFoundation import ImageIO import TelegramCore -#if BUCK -import WebPImage -#else import WebP -#endif import TelegramUIPreferences import MediaResources import AccountContext diff --git a/submodules/PlatformRestrictionMatching/BUCK b/submodules/PlatformRestrictionMatching/BUCK new file mode 100644 index 0000000000..0f7e74075f --- /dev/null +++ b/submodules/PlatformRestrictionMatching/BUCK @@ -0,0 +1,14 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "PlatformRestrictionMatching", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/TelegramCore:TelegramCore#dynamic", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/Postbox/BUCK b/submodules/Postbox/BUCK new file mode 100644 index 0000000000..95eeb14cea --- /dev/null +++ b/submodules/Postbox/BUCK @@ -0,0 +1,24 @@ +load("//Config:buck_rule_macros.bzl", "framework") + +framework( + name = "Postbox", + srcs = glob([ + "Postbox/*.swift", + "Postbox/*.m", + ]), + headers = [ + "Postbox/MurMurHash32.h", + ], + exported_headers = [ + "Postbox/MurMurHash32.h", + ], + deps = [ + "//submodules/Crc32:Crc32", + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/sqlcipher:sqlcipher", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/Security.framework", + ], +) diff --git a/submodules/QrCode/BUCK b/submodules/QrCode/BUCK new file mode 100644 index 0000000000..e1bccc580c --- /dev/null +++ b/submodules/QrCode/BUCK @@ -0,0 +1,17 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "QrCode", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/Display:Display#shared", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + "$SDKROOT/System/Library/Frameworks/CoreImage.framework", + ], +) diff --git a/submodules/RLottie/BUCK b/submodules/RLottie/BUCK new file mode 100644 index 0000000000..b01fcc8165 --- /dev/null +++ b/submodules/RLottie/BUCK @@ -0,0 +1,25 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "RLottie", + srcs = glob([ + "Sources/rlottie/src/**/*.cpp", + ]) + [ + "Sources/LottieInstance.mm" + ], + headers = glob([ + "Sources/rlottie/src/**/*.h", + "Sources/rlottie/inc/**/*.h", + ], exclude = [ + "Sources/rlottie/src/lottie/rapidjson/msinttypes/**/*", + ]) + [ + "Sources/LottieInstance.h" + ], + exported_headers = [ + "Sources/LottieInstance.h" + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/RadialStatusNode/BUCK b/submodules/RadialStatusNode/BUCK new file mode 100644 index 0000000000..d041769254 --- /dev/null +++ b/submodules/RadialStatusNode/BUCK @@ -0,0 +1,17 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "RadialStatusNode", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/Display:Display#dynamic", + "//submodules/AsyncDisplayKit:AsyncDisplayKit#dynamic", + "//submodules/LegacyComponents:LegacyComponents", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/RaiseToListen/BUCK b/submodules/RaiseToListen/BUCK new file mode 100644 index 0000000000..b097aa0388 --- /dev/null +++ b/submodules/RaiseToListen/BUCK @@ -0,0 +1,21 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "RaiseToListen", + srcs = glob([ + "Sources/*.m", + ]), + headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/RaiseToListen.h"]), + exported_headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/RaiseToListen.h"]), + deps = [ + "//submodules/DeviceProximity:DeviceProximity", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/SSignalKit/SSignalKit/BUCK b/submodules/SSignalKit/SSignalKit/BUCK new file mode 100644 index 0000000000..8d592db616 --- /dev/null +++ b/submodules/SSignalKit/SSignalKit/BUCK @@ -0,0 +1,19 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "SSignalKit", + srcs = glob([ + "*.m", + ]), + headers = glob([ + "*.h", + ]), + exported_headers = glob([ + "*.h", + ]), + deps = [ + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/SSignalKit/SwiftSignalKit/BUCK b/submodules/SSignalKit/SwiftSignalKit/BUCK new file mode 100644 index 0000000000..6b19fa5041 --- /dev/null +++ b/submodules/SSignalKit/SwiftSignalKit/BUCK @@ -0,0 +1,13 @@ +load("//Config:buck_rule_macros.bzl", "framework") + +framework( + name = "SwiftSignalKit", + srcs = glob([ + "*.swift", + ]), + deps = [ + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/SSignalKit/SwiftSignalKit/SwiftSignalKit.xcodeproj/project.pbxproj b/submodules/SSignalKit/SwiftSignalKit/SwiftSignalKit.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..e00aba358f --- /dev/null +++ b/submodules/SSignalKit/SwiftSignalKit/SwiftSignalKit.xcodeproj/project.pbxproj @@ -0,0 +1,871 @@ + + + + + archiveVersion + 1 + classes + + + objectVersion + 46 + objects + + 1DD70E29FAA9BD8800000000 + + isa + PBXFileReference + name + SwiftSignalKit#shared-Debug.xcconfig + path + ../../../buck-out/gen/submodules/SSignalKit/SwiftSignalKit/SwiftSignalKit#shared-Debug.xcconfig + sourceTree + SOURCE_ROOT + explicitFileType + text.xcconfig + + 1DD70E29DC5312F200000000 + + isa + PBXFileReference + name + SwiftSignalKit#shared-Profile.xcconfig + path + ../../../buck-out/gen/submodules/SSignalKit/SwiftSignalKit/SwiftSignalKit#shared-Profile.xcconfig + sourceTree + SOURCE_ROOT + explicitFileType + text.xcconfig + + 1DD70E294FE9BE5400000000 + + isa + PBXFileReference + name + SwiftSignalKit#shared-Release.xcconfig + path + ../../../buck-out/gen/submodules/SSignalKit/SwiftSignalKit/SwiftSignalKit#shared-Release.xcconfig + sourceTree + SOURCE_ROOT + explicitFileType + text.xcconfig + + B401C9792F7F325000000000 + + isa + PBXGroup + name + Buck (Do Not Modify) + sourceTree + ]]> + children + + 1DD70E29FAA9BD8800000000 + 1DD70E29DC5312F200000000 + 1DD70E294FE9BE5400000000 + + + B401C979B781F65D00000000 + + isa + PBXGroup + name + Configurations + sourceTree + ]]> + children + + B401C9792F7F325000000000 + + + 1DD70E29AE317AA300000000 + + isa + PBXFileReference + name + Foundation.framework + path + System/Library/Frameworks/Foundation.framework + sourceTree + SDKROOT + explicitFileType + wrapper.framework + + B401C97968022A5500000000 + + isa + PBXGroup + name + Frameworks + sourceTree + ]]> + children + + 1DD70E29AE317AA300000000 + + + 1DD70E29D65BA68200000000 + + isa + PBXFileReference + name + libSwiftSignalKit.dylib + path + libSwiftSignalKit.dylib + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + compiled.mach-o.dylib + + B401C979C806358400000000 + + isa + PBXGroup + name + Products + sourceTree + ]]> + children + + 1DD70E29D65BA68200000000 + + + 1DD70E29001F47FB00000000 + + isa + PBXFileReference + name + BUCK + path + BUCK + sourceTree + SOURCE_ROOT + explicitFileType + text.script.python + + 1DD70E29DE26C8B000000000 + + isa + PBXFileReference + name + Atomic.swift + path + Atomic.swift + sourceTree + SOURCE_ROOT + + 1DD70E2933A3A08D00000000 + + isa + PBXFileReference + name + Bag.swift + path + Bag.swift + sourceTree + SOURCE_ROOT + + 1DD70E29275AC42500000000 + + isa + PBXFileReference + name + Disposable.swift + path + Disposable.swift + sourceTree + SOURCE_ROOT + + 1DD70E296CD3FFB000000000 + + isa + PBXFileReference + name + Lock.swift + path + Lock.swift + sourceTree + SOURCE_ROOT + + 1DD70E290CC9147D00000000 + + isa + PBXFileReference + name + Multicast.swift + path + Multicast.swift + sourceTree + SOURCE_ROOT + + 1DD70E293695936000000000 + + isa + PBXFileReference + name + Promise.swift + path + Promise.swift + sourceTree + SOURCE_ROOT + + 1DD70E29EEB71AD600000000 + + isa + PBXFileReference + name + Queue.swift + path + Queue.swift + sourceTree + SOURCE_ROOT + + 1DD70E29748F84BE00000000 + + isa + PBXFileReference + name + QueueLocalObject.swift + path + QueueLocalObject.swift + sourceTree + SOURCE_ROOT + + 1DD70E2991D84F6D00000000 + + isa + PBXFileReference + name + Signal.swift + path + Signal.swift + sourceTree + SOURCE_ROOT + + 1DD70E29F385560900000000 + + isa + PBXFileReference + name + Signal_Catch.swift + path + Signal_Catch.swift + sourceTree + SOURCE_ROOT + + 1DD70E29B8AFDB4D00000000 + + isa + PBXFileReference + name + Signal_Combine.swift + path + Signal_Combine.swift + sourceTree + SOURCE_ROOT + + 1DD70E298888A21600000000 + + isa + PBXFileReference + name + Signal_Dispatch.swift + path + Signal_Dispatch.swift + sourceTree + SOURCE_ROOT + + 1DD70E2913D2304000000000 + + isa + PBXFileReference + name + Signal_Loop.swift + path + Signal_Loop.swift + sourceTree + SOURCE_ROOT + + 1DD70E292295CF9C00000000 + + isa + PBXFileReference + name + Signal_Mapping.swift + path + Signal_Mapping.swift + sourceTree + SOURCE_ROOT + + 1DD70E29131B4DDB00000000 + + isa + PBXFileReference + name + Signal_Materialize.swift + path + Signal_Materialize.swift + sourceTree + SOURCE_ROOT + + 1DD70E296DE339C600000000 + + isa + PBXFileReference + name + Signal_Merge.swift + path + Signal_Merge.swift + sourceTree + SOURCE_ROOT + + 1DD70E292B57B2E100000000 + + isa + PBXFileReference + name + Signal_Meta.swift + path + Signal_Meta.swift + sourceTree + SOURCE_ROOT + + 1DD70E294C7A23C200000000 + + isa + PBXFileReference + name + Signal_Reduce.swift + path + Signal_Reduce.swift + sourceTree + SOURCE_ROOT + + 1DD70E2997FCB43900000000 + + isa + PBXFileReference + name + Signal_SideEffects.swift + path + Signal_SideEffects.swift + sourceTree + SOURCE_ROOT + + 1DD70E29BDC9812400000000 + + isa + PBXFileReference + name + Signal_Single.swift + path + Signal_Single.swift + sourceTree + SOURCE_ROOT + + 1DD70E29B4F667E300000000 + + isa + PBXFileReference + name + Signal_Take.swift + path + Signal_Take.swift + sourceTree + SOURCE_ROOT + + 1DD70E29334963A600000000 + + isa + PBXFileReference + name + Signal_Timing.swift + path + Signal_Timing.swift + sourceTree + SOURCE_ROOT + + 1DD70E29EA9A4D2D00000000 + + isa + PBXFileReference + name + Subscriber.swift + path + Subscriber.swift + sourceTree + SOURCE_ROOT + + 1DD70E299888E78B00000000 + + isa + PBXFileReference + name + ThreadPool.swift + path + ThreadPool.swift + sourceTree + SOURCE_ROOT + + 1DD70E290DB5920A00000000 + + isa + PBXFileReference + name + Timer.swift + path + Timer.swift + sourceTree + SOURCE_ROOT + + 1DD70E2973D9FE0400000000 + + isa + PBXFileReference + name + ValuePipe.swift + path + ValuePipe.swift + sourceTree + SOURCE_ROOT + + B401C979EAB5339800000000 + + isa + PBXGroup + name + Sources + sourceTree + ]]> + children + + 1DD70E29DE26C8B000000000 + 1DD70E2933A3A08D00000000 + 1DD70E29275AC42500000000 + 1DD70E296CD3FFB000000000 + 1DD70E290CC9147D00000000 + 1DD70E293695936000000000 + 1DD70E29EEB71AD600000000 + 1DD70E29748F84BE00000000 + 1DD70E2991D84F6D00000000 + 1DD70E29F385560900000000 + 1DD70E29B8AFDB4D00000000 + 1DD70E298888A21600000000 + 1DD70E2913D2304000000000 + 1DD70E292295CF9C00000000 + 1DD70E29131B4DDB00000000 + 1DD70E296DE339C600000000 + 1DD70E292B57B2E100000000 + 1DD70E294C7A23C200000000 + 1DD70E2997FCB43900000000 + 1DD70E29BDC9812400000000 + 1DD70E29B4F667E300000000 + 1DD70E29334963A600000000 + 1DD70E29EA9A4D2D00000000 + 1DD70E299888E78B00000000 + 1DD70E290DB5920A00000000 + 1DD70E2973D9FE0400000000 + + + B401C97989A74F8D00000000 + + isa + PBXGroup + name + SwiftSignalKit#shared + sourceTree + ]]> + children + + 1DD70E29001F47FB00000000 + B401C979EAB5339800000000 + + + B401C979EFB6AC4600000000 + + isa + PBXGroup + name + mainGroup + sourceTree + ]]> + children + + B401C979B781F65D00000000 + B401C97968022A5500000000 + B401C979C806358400000000 + B401C97989A74F8D00000000 + + + E7A30F04DE26C8B000000000 + + isa + PBXBuildFile + fileRef + 1DD70E29DE26C8B000000000 + + E7A30F0433A3A08D00000000 + + isa + PBXBuildFile + fileRef + 1DD70E2933A3A08D00000000 + + E7A30F04275AC42500000000 + + isa + PBXBuildFile + fileRef + 1DD70E29275AC42500000000 + + E7A30F046CD3FFB000000000 + + isa + PBXBuildFile + fileRef + 1DD70E296CD3FFB000000000 + + E7A30F040CC9147D00000000 + + isa + PBXBuildFile + fileRef + 1DD70E290CC9147D00000000 + + E7A30F043695936000000000 + + isa + PBXBuildFile + fileRef + 1DD70E293695936000000000 + + E7A30F04EEB71AD600000000 + + isa + PBXBuildFile + fileRef + 1DD70E29EEB71AD600000000 + + E7A30F04748F84BE00000000 + + isa + PBXBuildFile + fileRef + 1DD70E29748F84BE00000000 + + E7A30F0491D84F6D00000000 + + isa + PBXBuildFile + fileRef + 1DD70E2991D84F6D00000000 + + E7A30F04F385560900000000 + + isa + PBXBuildFile + fileRef + 1DD70E29F385560900000000 + + E7A30F04B8AFDB4D00000000 + + isa + PBXBuildFile + fileRef + 1DD70E29B8AFDB4D00000000 + + E7A30F048888A21600000000 + + isa + PBXBuildFile + fileRef + 1DD70E298888A21600000000 + + E7A30F0413D2304000000000 + + isa + PBXBuildFile + fileRef + 1DD70E2913D2304000000000 + + E7A30F042295CF9C00000000 + + isa + PBXBuildFile + fileRef + 1DD70E292295CF9C00000000 + + E7A30F04131B4DDB00000000 + + isa + PBXBuildFile + fileRef + 1DD70E29131B4DDB00000000 + + E7A30F046DE339C600000000 + + isa + PBXBuildFile + fileRef + 1DD70E296DE339C600000000 + + E7A30F042B57B2E100000000 + + isa + PBXBuildFile + fileRef + 1DD70E292B57B2E100000000 + + E7A30F044C7A23C200000000 + + isa + PBXBuildFile + fileRef + 1DD70E294C7A23C200000000 + + E7A30F0497FCB43900000000 + + isa + PBXBuildFile + fileRef + 1DD70E2997FCB43900000000 + + E7A30F04BDC9812400000000 + + isa + PBXBuildFile + fileRef + 1DD70E29BDC9812400000000 + + E7A30F04B4F667E300000000 + + isa + PBXBuildFile + fileRef + 1DD70E29B4F667E300000000 + + E7A30F04334963A600000000 + + isa + PBXBuildFile + fileRef + 1DD70E29334963A600000000 + + E7A30F04EA9A4D2D00000000 + + isa + PBXBuildFile + fileRef + 1DD70E29EA9A4D2D00000000 + + E7A30F049888E78B00000000 + + isa + PBXBuildFile + fileRef + 1DD70E299888E78B00000000 + + E7A30F040DB5920A00000000 + + isa + PBXBuildFile + fileRef + 1DD70E290DB5920A00000000 + + E7A30F0473D9FE0400000000 + + isa + PBXBuildFile + fileRef + 1DD70E2973D9FE0400000000 + + 1870857F0000000000000000 + + isa + PBXSourcesBuildPhase + files + + E7A30F04DE26C8B000000000 + E7A30F0433A3A08D00000000 + E7A30F04275AC42500000000 + E7A30F046CD3FFB000000000 + E7A30F040CC9147D00000000 + E7A30F043695936000000000 + E7A30F04EEB71AD600000000 + E7A30F04748F84BE00000000 + E7A30F0491D84F6D00000000 + E7A30F04F385560900000000 + E7A30F04B8AFDB4D00000000 + E7A30F048888A21600000000 + E7A30F0413D2304000000000 + E7A30F042295CF9C00000000 + E7A30F04131B4DDB00000000 + E7A30F046DE339C600000000 + E7A30F042B57B2E100000000 + E7A30F044C7A23C200000000 + E7A30F0497FCB43900000000 + E7A30F04BDC9812400000000 + E7A30F04B4F667E300000000 + E7A30F04334963A600000000 + E7A30F04EA9A4D2D00000000 + E7A30F049888E78B00000000 + E7A30F040DB5920A00000000 + E7A30F0473D9FE0400000000 + + + E7A30F04AE317AA300000000 + + isa + PBXBuildFile + fileRef + 1DD70E29AE317AA300000000 + + 4F426D880000000000000000 + + isa + PBXFrameworksBuildPhase + files + + E7A30F04AE317AA300000000 + + + 4952437303EDA63300000000 + + isa + XCBuildConfiguration + name + Debug + buildSettings + + + baseConfigurationReference + 1DD70E29FAA9BD8800000000 + + 4952437350C7218900000000 + + isa + XCBuildConfiguration + name + Profile + buildSettings + + + baseConfigurationReference + 1DD70E29DC5312F200000000 + + 49524373A439BFE700000000 + + isa + XCBuildConfiguration + name + Release + buildSettings + + + baseConfigurationReference + 1DD70E294FE9BE5400000000 + + 218C37090000000000000000 + + isa + XCConfigurationList + buildConfigurations + + 4952437303EDA63300000000 + 4952437350C7218900000000 + 49524373A439BFE700000000 + + defaultConfigurationIsVisible + + + E66DC04E89A74F8D00000000 + + isa + PBXNativeTarget + name + SwiftSignalKit#shared + productName + SwiftSignalKit + productReference + 1DD70E29D65BA68200000000 + productType + com.apple.product-type.library.dynamic + dependencies + + + buildPhases + + 1870857F0000000000000000 + 4F426D880000000000000000 + + 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 + + + 96C84793FD7F2A5B00000000 + + isa + PBXProject + mainGroup + B401C979EFB6AC4600000000 + targets + + E66DC04E89A74F8D00000000 + + buildConfigurationList + 218C37090000000000000001 + compatibilityVersion + Xcode 3.2 + attributes + + LastUpgradeCheck + 9999 + + + + rootObject + 96C84793FD7F2A5B00000000 + + \ No newline at end of file diff --git a/submodules/Emoji/Emoji.xcodeproj/xcshareddata/xcschemes/Emoji.xcscheme b/submodules/SSignalKit/SwiftSignalKit/SwiftSignalKit.xcodeproj/xcshareddata/xcschemes/SwiftSignalKit.xcscheme similarity index 80% rename from submodules/Emoji/Emoji.xcodeproj/xcshareddata/xcschemes/Emoji.xcscheme rename to submodules/SSignalKit/SwiftSignalKit/SwiftSignalKit.xcodeproj/xcshareddata/xcschemes/SwiftSignalKit.xcscheme index cd1d497165..c82fe8764f 100644 --- a/submodules/Emoji/Emoji.xcodeproj/xcshareddata/xcschemes/Emoji.xcscheme +++ b/submodules/SSignalKit/SwiftSignalKit/SwiftSignalKit.xcodeproj/xcshareddata/xcschemes/SwiftSignalKit.xcscheme @@ -14,10 +14,10 @@ buildForAnalyzing = "YES"> + BlueprintIdentifier = "E66DC04E89A74F8D00000000" + BuildableName = "libSwiftSignalKit.dylib" + BlueprintName = "SwiftSignalKit#shared" + ReferencedContainer = "container:SwiftSignalKit.xcodeproj"> @@ -45,10 +45,10 @@ + BlueprintIdentifier = "E66DC04E89A74F8D00000000" + BuildableName = "libSwiftSignalKit.dylib" + BlueprintName = "SwiftSignalKit#shared" + ReferencedContainer = "container:SwiftSignalKit.xcodeproj"> diff --git a/submodules/SaveToCameraRoll/BUCK b/submodules/SaveToCameraRoll/BUCK new file mode 100644 index 0000000000..bace5e0e7a --- /dev/null +++ b/submodules/SaveToCameraRoll/BUCK @@ -0,0 +1,22 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "SaveToCameraRoll", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/Postbox:Postbox#shared", + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/Display:Display#shared", + "//submodules/AccountContext:AccountContext", + "//submodules/DeviceAccess:DeviceAccess", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + "$SDKROOT/System/Library/Frameworks/MobileCoreServices.framework", + "$SDKROOT/System/Library/Frameworks/Photos.framework", + ], +) diff --git a/submodules/ScreenCaptureDetection/BUCK b/submodules/ScreenCaptureDetection/BUCK new file mode 100644 index 0000000000..d3e7dedcdd --- /dev/null +++ b/submodules/ScreenCaptureDetection/BUCK @@ -0,0 +1,15 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "ScreenCaptureDetection", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/ShareItems/BUCK b/submodules/ShareItems/BUCK new file mode 100644 index 0000000000..dd8fac4a33 --- /dev/null +++ b/submodules/ShareItems/BUCK @@ -0,0 +1,31 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "ShareItems", + srcs = glob([ + "Sources/*.swift", + "Sources/*.m", + ]), + headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/ShareItems.h"]), + exported_headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/ShareItems.h"]), + deps = [ + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/Postbox:Postbox#shared", + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/MtProtoKit:MtProtoKit#shared", + "//submodules/Display:Display#shared", + "//submodules/LegacyComponents:LegacyComponents", + "//submodules/LocalMediaResources:LocalMediaResources", + "//submodules/Pdf:Pdf", + "//submodules/AccountContext:AccountContext", + "//submodules/MimeTypes:MimeTypes", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/ShareItems/Sources/TGItemProviderSignals.h b/submodules/ShareItems/Sources/TGItemProviderSignals.h index 1427dc9119..0206e6cb76 100644 --- a/submodules/ShareItems/Sources/TGItemProviderSignals.h +++ b/submodules/ShareItems/Sources/TGItemProviderSignals.h @@ -1,8 +1,6 @@ -#ifdef BUCK -#import -#else -#import -#endif +#import + +@class MTSignal; @interface TGItemProviderSignals : NSObject diff --git a/submodules/ShareItems/Sources/TGItemProviderSignals.m b/submodules/ShareItems/Sources/TGItemProviderSignals.m index 32e9e543a3..cc4280fed6 100644 --- a/submodules/ShareItems/Sources/TGItemProviderSignals.m +++ b/submodules/ShareItems/Sources/TGItemProviderSignals.m @@ -1,5 +1,11 @@ #import "TGItemProviderSignals.h" +#ifdef BUCK +#import +#else +#import +#endif + #import #import #import diff --git a/submodules/ShareItems/Sources/TGShareLocationSignals.h b/submodules/ShareItems/Sources/TGShareLocationSignals.h index 77c9997dda..ba59c41955 100644 --- a/submodules/ShareItems/Sources/TGShareLocationSignals.h +++ b/submodules/ShareItems/Sources/TGShareLocationSignals.h @@ -1,8 +1,6 @@ -#ifdef BUCK -#import -#else -#import -#endif +#import + +@class MTSignal; @interface TGShareLocationResult : NSObject diff --git a/submodules/ShareItems/Sources/TGShareLocationSignals.m b/submodules/ShareItems/Sources/TGShareLocationSignals.m index 0dbe232c86..423536ab91 100644 --- a/submodules/ShareItems/Sources/TGShareLocationSignals.m +++ b/submodules/ShareItems/Sources/TGShareLocationSignals.m @@ -1,5 +1,11 @@ #import "TGShareLocationSignals.h" +#ifdef BUCK +#import +#else +#import +#endif + NSString *const TGShareAppleMapsHost = @"maps.apple.com"; NSString *const TGShareAppleMapsPath = @"/maps"; NSString *const TGShareAppleMapsLatLonKey = @"ll"; diff --git a/submodules/StickerResources/BUCK b/submodules/StickerResources/BUCK new file mode 100644 index 0000000000..10cc8c7b93 --- /dev/null +++ b/submodules/StickerResources/BUCK @@ -0,0 +1,23 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "StickerResources", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/Postbox:Postbox#shared", + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/Display:Display#shared", + "//submodules/ImageBlur:ImageBlur", + "//submodules/Tuples:Tuples", + "//submodules/MediaResources:MediaResources", + "//submodules/TelegramUIPreferences:TelegramUIPreferences", + "//submodules/WebP:WebP", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/Stripe/BUCK b/submodules/Stripe/BUCK new file mode 100644 index 0000000000..43502f6ee6 --- /dev/null +++ b/submodules/Stripe/BUCK @@ -0,0 +1,39 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "Stripe", + srcs = glob([ + "Sources/*.m", + ]), + headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/Stripe.h"]), + exported_headers = [ + "Sources/STPAddress.h", + "Sources/STPPaymentCardTextField.h", + "Sources/STPAPIClient.h", + "Sources/STPAPIClient+ApplePay.h", + "Sources/STPAPIResponseDecodable.h", + "Sources/STPPaymentConfiguration.h", + "Sources/STPCard.h", + "Sources/STPCardBrand.h", + "Sources/STPCardParams.h", + "Sources/STPToken.h", + "Sources/STPBankAccount.h", + "Sources/STPBankAccountParams.h", + "Sources/STPBINRange.h", + "Sources/STPCardValidator.h", + "Sources/STPCustomer.h", + "Sources/STPFormEncodable.h", + "Sources/STPPaymentMethod.h", + "Sources/STPPhoneNumberValidator.h", + "Sources/STPPostalCodeValidator.h", + "Sources/STPSource.h", + "Sources/STPBlocks.h", + "Sources/StripeError.h", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/TelegramApi/BUCK b/submodules/TelegramApi/BUCK new file mode 100644 index 0000000000..1767145ae5 --- /dev/null +++ b/submodules/TelegramApi/BUCK @@ -0,0 +1,13 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "TelegramApi", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/TelegramAudio/BUCK b/submodules/TelegramAudio/BUCK new file mode 100644 index 0000000000..7739d8184a --- /dev/null +++ b/submodules/TelegramAudio/BUCK @@ -0,0 +1,14 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "TelegramAudio", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#dynamic", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/TelegramCore/BUCK b/submodules/TelegramCore/BUCK new file mode 100644 index 0000000000..c15f515156 --- /dev/null +++ b/submodules/TelegramCore/BUCK @@ -0,0 +1,31 @@ +load("//Config:buck_rule_macros.bzl", "framework") + +framework( + name = "TelegramCore", + srcs = glob([ + "TelegramCore/*.swift", + "TelegramCore/*.m", + ]), + headers = [ + "TelegramCore/FormatPhoneNumber.h", + "TelegramCore/Crypto.h", + "TelegramCore/NetworkLogging.h", + "TelegramCore/Reachability.h", + ], + exported_headers = [ + "TelegramCore/FormatPhoneNumber.h", + "TelegramCore/Crypto.h", + "TelegramCore/NetworkLogging.h", + "TelegramCore/Reachability.h", + ], + deps = [ + "//submodules/libphonenumber:libphonenumber", + "//submodules/TelegramApi:TelegramApi", + "//submodules/MtProtoKit:MtProtoKit#shared", + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/Postbox:Postbox#shared", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/TelegramCore/TelegramCore_Xcode.xcodeproj/project.pbxproj b/submodules/TelegramCore/TelegramCore_Xcode.xcodeproj/project.pbxproj index e39dd695d5..22656ab8d5 100644 --- a/submodules/TelegramCore/TelegramCore_Xcode.xcodeproj/project.pbxproj +++ b/submodules/TelegramCore/TelegramCore_Xcode.xcodeproj/project.pbxproj @@ -540,7 +540,6 @@ D0AF32311FACEDEC0097362B /* CoreSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0AF32301FACEDEC0097362B /* CoreSettings.swift */; }; D0AF32321FACEDEC0097362B /* CoreSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0AF32301FACEDEC0097362B /* CoreSettings.swift */; }; D0AF32351FAE8C6B0097362B /* MultipeerManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0AF32341FAE8C6B0097362B /* MultipeerManager.swift */; }; - D0AF32381FAE8C920097362B /* MultipeerConnectivity.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0AF32371FAE8C910097362B /* MultipeerConnectivity.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; D0B1671D1F9EA2C300976B40 /* ChatHistoryPreloadManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0B1671C1F9EA2C300976B40 /* ChatHistoryPreloadManager.swift */; }; D0B1671E1F9EA2C300976B40 /* ChatHistoryPreloadManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0B1671C1F9EA2C300976B40 /* ChatHistoryPreloadManager.swift */; }; D0B167231F9F972E00976B40 /* LoggingSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0B167221F9F972E00976B40 /* LoggingSettings.swift */; }; @@ -1208,7 +1207,6 @@ files = ( D03E45D42305D44A0049C28B /* libphonenumber.framework in Frameworks */, D035732F22B5C24F00F0920D /* TelegramApi.framework in Frameworks */, - D0AF32381FAE8C920097362B /* MultipeerConnectivity.framework in Frameworks */, D0CAF2EA1D75EC600011F558 /* MtProtoKitDynamic.framework in Frameworks */, D067066C1D512ADB00DED3E3 /* Postbox.framework in Frameworks */, D067066D1D512ADB00DED3E3 /* SwiftSignalKit.framework in Frameworks */, diff --git a/submodules/TelegramNotices/BUCK b/submodules/TelegramNotices/BUCK new file mode 100644 index 0000000000..a1c1b07e2d --- /dev/null +++ b/submodules/TelegramNotices/BUCK @@ -0,0 +1,16 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "TelegramNotices", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/Postbox:Postbox#shared", + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/TelegramPermissions:TelegramPermissions", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/TelegramPermissions/BUCK b/submodules/TelegramPermissions/BUCK new file mode 100644 index 0000000000..baa022d392 --- /dev/null +++ b/submodules/TelegramPermissions/BUCK @@ -0,0 +1,18 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "TelegramPermissions", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/Postbox:Postbox#shared", + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/AccountContext:AccountContext", + "//submodules/DeviceAccess:DeviceAccess", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/TelegramPresentationData/BUCK b/submodules/TelegramPresentationData/BUCK new file mode 100644 index 0000000000..41143dfe19 --- /dev/null +++ b/submodules/TelegramPresentationData/BUCK @@ -0,0 +1,27 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "TelegramPresentationData", + srcs = glob([ + "Sources/**/*.swift", + "Sources/*.m", + ]), + headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/TelegramPresentationData.h"]), + exported_headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/TelegramPresentationData.h"]), + deps = [ + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/Postbox:Postbox#shared", + "//submodules/Display:Display#shared", + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/TelegramUIPreferences:TelegramUIPreferences", + "//submodules/MediaResources:MediaResources", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/TelegramStringFormatting/BUCK b/submodules/TelegramStringFormatting/BUCK new file mode 100644 index 0000000000..a1b6605c78 --- /dev/null +++ b/submodules/TelegramStringFormatting/BUCK @@ -0,0 +1,21 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "TelegramStringFormatting", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/Postbox:Postbox#shared", + "//submodules/Display:Display#shared", + "//submodules/PlatformRestrictionMatching:PlatformRestrictionMatching", + "//submodules/LocalizedPeerData:LocalizedPeerData", + "//submodules/TextFormat:TextFormat", + "//submodules/TelegramUIPreferences:TelegramUIPreferences", + "//submodules/TelegramPresentationData:TelegramPresentationData", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/TelegramUI/TelegramUI/ConvertToWebP.swift b/submodules/TelegramUI/TelegramUI/ConvertToWebP.swift index 029f42b8f7..664cb74006 100644 --- a/submodules/TelegramUI/TelegramUI/ConvertToWebP.swift +++ b/submodules/TelegramUI/TelegramUI/ConvertToWebP.swift @@ -2,11 +2,7 @@ import UIKit import SwiftSignalKit import LegacyComponents import Display -#if BUCK -import WebPImage -#else import WebP -#endif private func scaleImage(_ image: UIImage, dimensions: CGSize) -> UIImage? { if #available(iOSApplicationExtension 10.0, iOS 10.0, *) { diff --git a/submodules/TelegramUI/TelegramUI/EmojiResources.swift b/submodules/TelegramUI/TelegramUI/EmojiResources.swift index 045c0e8a71..c00742693a 100644 --- a/submodules/TelegramUI/TelegramUI/EmojiResources.swift +++ b/submodules/TelegramUI/TelegramUI/EmojiResources.swift @@ -4,11 +4,7 @@ import Postbox import TelegramCore import SwiftSignalKit import Display -#if BUCK -import WebPImage -#else import WebP -#endif import MediaResources import Emoji diff --git a/submodules/TelegramUI/TelegramUI/FetchCachedRepresentations.swift b/submodules/TelegramUI/TelegramUI/FetchCachedRepresentations.swift index 298f544eff..a5fd7c98cd 100644 --- a/submodules/TelegramUI/TelegramUI/FetchCachedRepresentations.swift +++ b/submodules/TelegramUI/TelegramUI/FetchCachedRepresentations.swift @@ -7,11 +7,7 @@ import ImageIO import MobileCoreServices import Display import AVFoundation -#if BUCK -import WebPImage -#else import WebP -#endif import Lottie import MediaResources import PhotoResources diff --git a/submodules/TelegramUIPreferences/BUCK b/submodules/TelegramUIPreferences/BUCK new file mode 100644 index 0000000000..33629dcfe5 --- /dev/null +++ b/submodules/TelegramUIPreferences/BUCK @@ -0,0 +1,17 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "TelegramUIPreferences", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/Postbox:Postbox#shared", + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/Display:Display#shared", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/TelegramUniversalVideoContent/BUCK b/submodules/TelegramUniversalVideoContent/BUCK new file mode 100644 index 0000000000..b18b78638e --- /dev/null +++ b/submodules/TelegramUniversalVideoContent/BUCK @@ -0,0 +1,25 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "TelegramUniversalVideoContent", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/AsyncDisplayKit:AsyncDisplayKit#shared", + "//submodules/Display:Display#shared", + "//submodules/Postbox:Postbox#shared", + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/MediaPlayer:UniversalMediaPlayer", + "//submodules/AccountContext:AccountContext", + "//submodules/TelegramPresentationData:TelegramPresentationData", + "//submodules/PhotoResources:PhotoResources", + "//submodules/LegacyComponents:LegacyComponents", + "//submodules/RadialStatusNode:RadialStatusNode", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/TemporaryCachedPeerDataManager/BUCK b/submodules/TemporaryCachedPeerDataManager/BUCK new file mode 100644 index 0000000000..0f5ae88b5d --- /dev/null +++ b/submodules/TemporaryCachedPeerDataManager/BUCK @@ -0,0 +1,17 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "TemporaryCachedPeerDataManager", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/TelegramStringFormatting:TelegramStringFormatting", + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#dynamic", + "//submodules/TelegramCore:TelegramCore#dynamic", + "//submodules/Postbox:Postbox#dynamic", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/TextFormat/BUCK b/submodules/TextFormat/BUCK new file mode 100644 index 0000000000..1106d477ca --- /dev/null +++ b/submodules/TextFormat/BUCK @@ -0,0 +1,16 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "TextFormat", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/TelegramCore:TelegramCore#dynamic", + "//submodules/Display:Display#dynamic", + "//submodules/TelegramPresentationData:TelegramPresentationData", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/TinyThumbnail/BUCK b/submodules/TinyThumbnail/BUCK new file mode 100644 index 0000000000..a0d1aacf81 --- /dev/null +++ b/submodules/TinyThumbnail/BUCK @@ -0,0 +1,11 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "TinyThumbnail", + srcs = glob([ + "Sources/*.swift", + ]), + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/Tuples/BUCK b/submodules/Tuples/BUCK new file mode 100644 index 0000000000..304d64d6db --- /dev/null +++ b/submodules/Tuples/BUCK @@ -0,0 +1,11 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "Tuples", + srcs = glob([ + "Sources/*.swift", + ]), + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/UrlEscaping/BUCK b/submodules/UrlEscaping/BUCK new file mode 100644 index 0000000000..3eed4f12c1 --- /dev/null +++ b/submodules/UrlEscaping/BUCK @@ -0,0 +1,11 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "UrlEscaping", + srcs = glob([ + "Sources/*.swift", + ]), + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/UrlHandling/BUCK b/submodules/UrlHandling/BUCK new file mode 100644 index 0000000000..d749f46cda --- /dev/null +++ b/submodules/UrlHandling/BUCK @@ -0,0 +1,20 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "UrlHandling", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/Postbox:Postbox#shared", + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/MtProtoKit:MtProtoKit#shared", + "//submodules/AccountContext:AccountContext", + "//submodules/TelegramUIPreferences:TelegramUIPreferences", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/WallpaperResources/BUCK b/submodules/WallpaperResources/BUCK new file mode 100644 index 0000000000..4033829aac --- /dev/null +++ b/submodules/WallpaperResources/BUCK @@ -0,0 +1,23 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "WallpaperResources", + srcs = glob([ + "Sources/*.swift", + ]), + deps = [ + "//submodules/TelegramCore:TelegramCore#shared", + "//submodules/Postbox:Postbox#shared", + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/Display:Display#shared", + "//submodules/LocalMediaResources:LocalMediaResources", + "//submodules/TinyThumbnail:TinyThumbnail", + "//submodules/ImageBlur:ImageBlur", + "//submodules/MediaResources:MediaResources", + "//submodules/PhotoResources:PhotoResources", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/WatchCommon/BUCK b/submodules/WatchCommon/BUCK new file mode 100644 index 0000000000..0640ff594d --- /dev/null +++ b/submodules/WatchCommon/BUCK @@ -0,0 +1,33 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "WatchCommon", + srcs = glob([ + "Sources/*.m", + ]), + headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/WatchCommon.h"]), + exported_headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/WatchCommon.h"]), + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) + +static_library( + name = "WatchCommonWatch", + srcs = glob([ + "Sources/*.m", + ]), + headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/WatchCommonWatch.h"]), + exported_headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/WatchCommonWatch.h"]), + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/WebsiteType/BUCK b/submodules/WebsiteType/BUCK new file mode 100644 index 0000000000..bdd4c6a9a2 --- /dev/null +++ b/submodules/WebsiteType/BUCK @@ -0,0 +1,11 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "WebsiteType", + srcs = glob([ + "Sources/*.swift", + ]), + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/YuvConversion/BUCK b/submodules/YuvConversion/BUCK new file mode 100644 index 0000000000..735ac133f2 --- /dev/null +++ b/submodules/YuvConversion/BUCK @@ -0,0 +1,18 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "YuvConversion", + srcs = glob([ + "Sources/*.m", + ]), + headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/YuvConversion.h"]), + exported_headers = glob([ + "Sources/*.h", + ], exclude = ["Sources/YuvConversion.h"]), + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/Accelerate.framework", + ], +) diff --git a/submodules/YuvConversion/YuvConversion.xcodeproj/project.pbxproj b/submodules/YuvConversion/YuvConversion_Xcode.xcodeproj/project.pbxproj similarity index 99% rename from submodules/YuvConversion/YuvConversion.xcodeproj/project.pbxproj rename to submodules/YuvConversion/YuvConversion_Xcode.xcodeproj/project.pbxproj index 43d47d6dec..d2536aa321 100644 --- a/submodules/YuvConversion/YuvConversion.xcodeproj/project.pbxproj +++ b/submodules/YuvConversion/YuvConversion_Xcode.xcodeproj/project.pbxproj @@ -122,7 +122,7 @@ }; }; }; - buildConfigurationList = D03E3E6D2304B63E0049C28B /* Build configuration list for PBXProject "YuvConversion" */; + buildConfigurationList = D03E3E6D2304B63E0049C28B /* Build configuration list for PBXProject "YuvConversion_Xcode" */; compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; @@ -504,7 +504,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - D03E3E6D2304B63E0049C28B /* Build configuration list for PBXProject "YuvConversion" */ = { + D03E3E6D2304B63E0049C28B /* Build configuration list for PBXProject "YuvConversion_Xcode" */ = { isa = XCConfigurationList; buildConfigurations = ( D03E3E792304B63E0049C28B /* DebugAppStoreLLC */, diff --git a/submodules/ffmpeg/BUCK b/submodules/ffmpeg/BUCK new file mode 100644 index 0000000000..f4f3346dd3 --- /dev/null +++ b/submodules/ffmpeg/BUCK @@ -0,0 +1,180 @@ +load("//Config:buck_rule_macros.bzl", "static_library", "gen_header_targets") + +ffmpeg_header_paths = [ + "libavutil/hwcontext.h", + "libavutil/time.h", + "libavutil/hwcontext_cuda.h", + "libavutil/intfloat.h", + "libavutil/error.h", + "libavutil/fifo.h", + "libavutil/blowfish.h", + "libavutil/hwcontext_mediacodec.h", + "libavutil/replaygain.h", + "libavutil/version.h", + "libavutil/murmur3.h", + "libavutil/stereo3d.h", + "libavutil/samplefmt.h", + "libavutil/pixdesc.h", + "libavutil/base64.h", + "libavutil/rational.h", + "libavutil/sha.h", + "libavutil/motion_vector.h", + "libavutil/avconfig.h", + "libavutil/lfg.h", + "libavutil/avutil.h", + "libavutil/xtea.h", + "libavutil/crc.h", + "libavutil/hwcontext_vdpau.h", + "libavutil/frame.h", + "libavutil/file.h", + "libavutil/md5.h", + "libavutil/cast5.h", + "libavutil/hwcontext_vaapi.h", + "libavutil/spherical.h", + "libavutil/ffversion.h", + "libavutil/audio_fifo.h", + "libavutil/tree.h", + "libavutil/threadmessage.h", + "libavutil/attributes.h", + "libavutil/adler32.h", + "libavutil/hwcontext_d3d11va.h", + "libavutil/timecode.h", + "libavutil/sha512.h", + "libavutil/hwcontext_dxva2.h", + "libavutil/display.h", + "libavutil/buffer.h", + "libavutil/camellia.h", + "libavutil/pixelutils.h", + "libavutil/hwcontext_drm.h", + "libavutil/common.h", + "libavutil/hmac.h", + "libavutil/eval.h", + "libavutil/dict.h", + "libavutil/random_seed.h", + "libavutil/opt.h", + "libavutil/mastering_display_metadata.h", + "libavutil/log.h", + "libavutil/aes.h", + "libavutil/macros.h", + "libavutil/bswap.h", + "libavutil/rc4.h", + "libavutil/tea.h", + "libavutil/cpu.h", + "libavutil/lzo.h", + "libavutil/des.h", + "libavutil/channel_layout.h", + "libavutil/encryption_info.h", + "libavutil/twofish.h", + "libavutil/imgutils.h", + "libavutil/hwcontext_videotoolbox.h", + "libavutil/mem.h", + "libavutil/parseutils.h", + "libavutil/ripemd.h", + "libavutil/bprint.h", + "libavutil/hwcontext_qsv.h", + "libavutil/pixfmt.h", + "libavutil/aes_ctr.h", + "libavutil/timestamp.h", + "libavutil/downmix_info.h", + "libavutil/avassert.h", + "libavutil/hash.h", + "libavutil/mathematics.h", + "libavutil/intreadwrite.h", + "libavutil/avstring.h", + "libavformat/version.h", + "libavformat/avio.h", + "libavformat/avformat.h", + "libavcodec/adts_parser.h", + "libavcodec/avcodec.h", + "libavcodec/version.h", + "libavcodec/vdpau.h", + "libavcodec/qsv.h", + "libavcodec/vaapi.h", + "libavcodec/videotoolbox.h", + "libavcodec/xvmc.h", + "libavcodec/mediacodec.h", + "libavcodec/d3d11va.h", + "libavcodec/avfft.h", + "libavcodec/jni.h", + "libavcodec/dirac.h", + "libavcodec/avdct.h", + "libavcodec/ac3_parser.h", + "libavcodec/vorbis_parser.h", + "libavcodec/dxva2.h", + "libavcodec/dv_profile.h", + "libswresample/version.h", + "libswresample/swresample.h", +] + +build_variant = "release" +library_archs = "arm64" if build_variant == "release" else "arm64 armv7 x86_64 i386" + +genrule( + name = "libffmpeg_build", + srcs = glob([ + "FFMpeg/**/*", + ]), + bash = "$SRCDIR/FFMpeg/build-ffmpeg.sh release \"" + library_archs + "\" $OUT $SRCDIR/FFMpeg", + out = "libffmpeg", + visibility = [ + "//submodules/ffmpeg:FFMpeg", + "//submodules/ffmpeg:libffmpeg", + ] +) + +ffmpeg_header_targets = gen_header_targets(ffmpeg_header_paths, "ffmpeg_header_", "", "libffmpeg_build", "FFmpeg-iOS/include") + +apple_library( + name = "libffmpeg", + visibility = [ + "//submodules/ffmpeg:FFMpeg" + ], + header_namespace = "ffmpeg", + exported_headers = ffmpeg_header_targets, + linker_flags = [ + "-L$(location :libffmpeg_build)/FFmpeg-iOS/lib", + "-lavutil", + "-lavcodec", + "-lavformat", + "-lswresample", + "-lbz2", + "-liconv", + "-lz", + ], + exported_linker_flags = [ + "-L$(location :libffmpeg_build)/FFmpeg-iOS/lib", + "-lavutil", + "-lavcodec", + "-lavformat", + "-lswresample", + "-lbz2", + "-liconv", + "-lz", + ], + deps = [ + ":libffmpeg_build", + "//submodules/Opus:opus", + ], +) + +static_library( + name = "FFMpeg", + srcs = glob([ + "FFMpeg/*.m", + ]), + headers = ffmpeg_header_targets, + exported_headers = glob([ + "FFMpeg/*.h", + ]), + deps = [ + ":libffmpeg_build", + ":libffmpeg", + "//submodules/Opus:opus", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + "$SDKROOT/System/Library/Frameworks/CoreMedia.framework", + "$SDKROOT/System/Library/Frameworks/AVFoundation.framework", + ], +) diff --git a/submodules/libphonenumber/BUCK b/submodules/libphonenumber/BUCK new file mode 100644 index 0000000000..14fc48fa58 --- /dev/null +++ b/submodules/libphonenumber/BUCK @@ -0,0 +1,22 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "libphonenumber", + srcs = glob([ + "Sources/*.m", + ]), + headers = glob([ + "Sources/*.h", + ]), + exported_headers = [ + "Sources/NBPhoneNumberDefines.h", + "Sources/NBPhoneNumber.h", + "Sources/NBPhoneNumberUtil.h", + "Sources/NBAsYouTypeFormatter.h", + ], + deps = [ + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/lottie-ios/BUCK b/submodules/lottie-ios/BUCK new file mode 100644 index 0000000000..91f6530fad --- /dev/null +++ b/submodules/lottie-ios/BUCK @@ -0,0 +1,20 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "Lottie", + srcs = glob([ + "lottie-ios/**/*.m", + ]), + headers = glob([ + "lottie-ios/**/*.h", + ]), + exported_headers = glob([ + "lottie-ios/Classes/PublicHeaders/*.h", + ]), + deps = [ + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/sqlcipher/BUCK b/submodules/sqlcipher/BUCK new file mode 100644 index 0000000000..8bd14acfbf --- /dev/null +++ b/submodules/sqlcipher/BUCK @@ -0,0 +1,30 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "sqlcipher", + compiler_flags = [ + "-DDSQLITE_HAS_CODEC=1", + "-DSQLCIPHER_CRYPTO_CC=1", + "-DSQLITE_ENABLE_FTS5", + "-DSQLITE_DEFAULT_MEMSTATUS=0", + "-DNDEBUG", + ], + srcs = glob([ + "Sources/*.c", + ]), + headers = [ + "Sources/sqlcipher_config.h", + "Sources/sqlite3.h", + "Sources/sqlite3ext.h", + ], + exported_headers = [ + "Sources/sqlcipher_config.h", + "Sources/sqlite3.h", + "Sources/sqlite3ext.h", + ], + deps = [ + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + ], +) diff --git a/submodules/sqlcipher/Sources/sqlite3.h b/submodules/sqlcipher/Sources/sqlite3.h index 9c7828b664..66160caed5 100644 --- a/submodules/sqlcipher/Sources/sqlite3.h +++ b/submodules/sqlcipher/Sources/sqlite3.h @@ -34,12 +34,13 @@ #define SQLITE3_H #include /* Needed for the definition of va_list */ -#if TARGET_OS_IOS -#include -#else +#if TARGET_OS_OSX #include +#else +#include #endif + /* ** Make sure we can call this stuff from C++. */ diff --git a/submodules/sqlcipher/Sources/sqlite3ext.h b/submodules/sqlcipher/Sources/sqlite3ext.h index 58dfe33f46..48273b4dc6 100644 --- a/submodules/sqlcipher/Sources/sqlite3ext.h +++ b/submodules/sqlcipher/Sources/sqlite3ext.h @@ -18,10 +18,10 @@ #ifndef SQLITE3EXT_H #define SQLITE3EXT_H -#if TARGET_OS_IOS -#include -#else +#if TARGET_OS_OSX #include +#else +#include #endif /* diff --git a/submodules/Emoji/Emoji.xcodeproj/project.pbxproj b/submodules/sqlcipher/sqlcipher.xcodeproj/project.pbxproj similarity index 61% rename from submodules/Emoji/Emoji.xcodeproj/project.pbxproj rename to submodules/sqlcipher/sqlcipher.xcodeproj/project.pbxproj index 2bf845743c..2fe13995bb 100644 --- a/submodules/Emoji/Emoji.xcodeproj/project.pbxproj +++ b/submodules/sqlcipher/sqlcipher.xcodeproj/project.pbxproj @@ -11,40 +11,40 @@ 46 objects - 1DD70E2987F4E91300000000 + 1DD70E2957B42A3C00000000 isa PBXFileReference name - Emoji#shared-Debug.xcconfig + sqlcipher-Debug.xcconfig path - ../../buck-out/gen/submodules/Emoji/Emoji#shared-Debug.xcconfig + ../../buck-out/gen/submodules/sqlcipher/sqlcipher-Debug.xcconfig sourceTree SOURCE_ROOT explicitFileType text.xcconfig - 1DD70E29438187BD00000000 + 1DD70E29207522A600000000 isa PBXFileReference name - Emoji#shared-Profile.xcconfig + sqlcipher-Profile.xcconfig path - ../../buck-out/gen/submodules/Emoji/Emoji#shared-Profile.xcconfig + ../../buck-out/gen/submodules/sqlcipher/sqlcipher-Profile.xcconfig sourceTree SOURCE_ROOT explicitFileType text.xcconfig - 1DD70E29B718331F00000000 + 1DD70E29940BCE0800000000 isa PBXFileReference name - Emoji#shared-Release.xcconfig + sqlcipher-Release.xcconfig path - ../../buck-out/gen/submodules/Emoji/Emoji#shared-Release.xcconfig + ../../buck-out/gen/submodules/sqlcipher/sqlcipher-Release.xcconfig sourceTree SOURCE_ROOT explicitFileType @@ -60,9 +60,9 @@ ]]> children - 1DD70E2987F4E91300000000 - 1DD70E29438187BD00000000 - 1DD70E29B718331F00000000 + 1DD70E2957B42A3C00000000 + 1DD70E29207522A600000000 + 1DD70E29940BCE0800000000 B401C979B781F65D00000000 @@ -78,6 +78,32 @@ B401C9792F7F325000000000 + 1DD70E29F6E0AD6700000000 + + isa + PBXFileReference + name + libsqlcipher.a + path + libsqlcipher.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + B401C979C806358400000000 + + isa + PBXGroup + name + Products + sourceTree + ]]> + children + + 1DD70E29F6E0AD6700000000 + + 1DD70E29001F47FB00000000 isa @@ -91,42 +117,57 @@ explicitFileType text.script.python - 1DD70E29E7E32A7000000000 + 1DD70E29591CD4E200000000 isa PBXFileReference name - TestFolder.bundle + sqlcipher_config.h path - TestFolder.bundle + Sources/sqlcipher_config.h sourceTree SOURCE_ROOT - explicitFileType - wrapper.cfbundle + lastKnownFileType + sourcecode.c.h - B401C979013EDE0500000000 - - isa - PBXGroup - name - Resources - sourceTree - ]]> - children - - 1DD70E29E7E32A7000000000 - - - 1DD70E29C4C3D69000000000 + 1DD70E298001D9DC00000000 isa PBXFileReference name - EmojiUtils.swift + sqlite3.c path - Sources/EmojiUtils.swift + Sources/sqlite3.c sourceTree SOURCE_ROOT + lastKnownFileType + sourcecode.c.c + + 1DD70E298001D9E100000000 + + isa + PBXFileReference + name + sqlite3.h + path + Sources/sqlite3.h + sourceTree + SOURCE_ROOT + lastKnownFileType + sourcecode.c.h + + 1DD70E295A79DA9400000000 + + isa + PBXFileReference + name + sqlite3ext.h + path + Sources/sqlite3ext.h + sourceTree + SOURCE_ROOT + lastKnownFileType + sourcecode.c.h B401C979EAB5339800000000 @@ -138,104 +179,26 @@ ]]> children - 1DD70E29C4C3D69000000000 + 1DD70E29591CD4E200000000 + 1DD70E298001D9DC00000000 + 1DD70E298001D9E100000000 + 1DD70E295A79DA9400000000 - B401C9796969DF6200000000 + B401C979752F915900000000 isa PBXGroup name - Emoji#shared + sqlcipher sourceTree ]]> children 1DD70E29001F47FB00000000 - B401C979013EDE0500000000 B401C979EAB5339800000000 - 1DD70E291188565800000000 - - isa - PBXFileReference - name - AVFoundation.framework - path - System/Library/Frameworks/AVFoundation.framework - sourceTree - SDKROOT - explicitFileType - wrapper.framework - - 1DD70E29A179AC1C00000000 - - isa - PBXFileReference - name - CoreText.framework - path - System/Library/Frameworks/CoreText.framework - sourceTree - SDKROOT - explicitFileType - wrapper.framework - - 1DD70E29AE317AA300000000 - - isa - PBXFileReference - name - Foundation.framework - path - System/Library/Frameworks/Foundation.framework - sourceTree - SDKROOT - explicitFileType - wrapper.framework - - B401C97968022A5500000000 - - isa - PBXGroup - name - Frameworks - sourceTree - ]]> - children - - 1DD70E291188565800000000 - 1DD70E29A179AC1C00000000 - 1DD70E29AE317AA300000000 - - - 1DD70E2987C9226300000000 - - isa - PBXFileReference - name - libEmoji.dylib - path - libEmoji.dylib - sourceTree - BUILT_PRODUCTS_DIR - explicitFileType - compiled.mach-o.dylib - - B401C979C806358400000000 - - isa - PBXGroup - name - Products - sourceTree - ]]> - children - - 1DD70E2987C9226300000000 - - B401C979EFB6AC4600000000 isa @@ -247,17 +210,16 @@ children B401C979B781F65D00000000 - B401C9796969DF6200000000 - B401C97968022A5500000000 B401C979C806358400000000 + B401C979752F915900000000 - E7A30F04C4C3D69000000000 + E7A30F048001D9DC00000000 isa PBXBuildFile fileRef - 1DD70E29C4C3D69000000000 + 1DD70E298001D9DC00000000 1870857F0000000000000000 @@ -265,39 +227,7 @@ PBXSourcesBuildPhase files - E7A30F04C4C3D69000000000 - - - E7A30F041188565800000000 - - isa - PBXBuildFile - fileRef - 1DD70E291188565800000000 - - E7A30F04A179AC1C00000000 - - isa - PBXBuildFile - fileRef - 1DD70E29A179AC1C00000000 - - E7A30F04AE317AA300000000 - - isa - PBXBuildFile - fileRef - 1DD70E29AE317AA300000000 - - 4F426D880000000000000000 - - isa - PBXFrameworksBuildPhase - files - - E7A30F041188565800000000 - E7A30F04A179AC1C00000000 - E7A30F04AE317AA300000000 + E7A30F048001D9DC00000000 4952437303EDA63300000000 @@ -310,7 +240,7 @@ baseConfigurationReference - 1DD70E2987F4E91300000000 + 1DD70E2957B42A3C00000000 4952437350C7218900000000 @@ -322,7 +252,7 @@ baseConfigurationReference - 1DD70E29438187BD00000000 + 1DD70E29207522A600000000 49524373A439BFE700000000 @@ -334,7 +264,7 @@ baseConfigurationReference - 1DD70E29B718331F00000000 + 1DD70E29940BCE0800000000 218C37090000000000000000 @@ -349,25 +279,24 @@ defaultConfigurationIsVisible - E66DC04E6969DF6200000000 + E66DC04E752F915900000000 isa PBXNativeTarget name - Emoji#shared + sqlcipher productName - Emoji + sqlcipher productReference - 1DD70E2987C9226300000000 + 1DD70E29F6E0AD6700000000 productType - com.apple.product-type.library.dynamic + com.apple.product-type.library.static dependencies buildPhases 1870857F0000000000000000 - 4F426D880000000000000000 buildConfigurationList 218C37090000000000000000 @@ -415,7 +344,7 @@ defaultConfigurationIsVisible - 96C8479303FF902600000000 + 96C84793752F915900000000 isa PBXProject @@ -423,7 +352,7 @@ B401C979EFB6AC4600000000 targets - E66DC04E6969DF6200000000 + E66DC04E752F915900000000 buildConfigurationList 218C37090000000000000001 @@ -437,6 +366,6 @@ rootObject - 96C8479303FF902600000000 + 96C84793752F915900000000 \ No newline at end of file diff --git a/submodules/sqlcipher/sqlcipher.xcodeproj/xcshareddata/xcschemes/sqlcipher.xcscheme b/submodules/sqlcipher/sqlcipher.xcodeproj/xcshareddata/xcschemes/sqlcipher.xcscheme new file mode 100644 index 0000000000..adf22b862a --- /dev/null +++ b/submodules/sqlcipher/sqlcipher.xcodeproj/xcshareddata/xcschemes/sqlcipher.xcscheme @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/submodules/webp/BUCK b/submodules/webp/BUCK new file mode 100644 index 0000000000..c42b0c222d --- /dev/null +++ b/submodules/webp/BUCK @@ -0,0 +1,48 @@ +load("//Config:buck_rule_macros.bzl", "static_library", "framework") + +genrule( + name = "WebP_lib_file", + srcs = [ + "lib/libwebp.a", + ], + bash = "mkdir -p $OUT; cp $SRCS $OUT/", + out = "WebP_libs", + visibility = ["PUBLIC"] +) + +apple_library( + name = "WebP_lib", + visibility = [ + "//submodules/WebP:..." + ], + header_namespace = "webp", + exported_headers = { + "webp/encode.h": "include/webp/encode.h", + "webp/decode.h": "include/webp/decode.h", + "webp/types.h": "include/webp/types.h", + }, + exported_linker_flags = [ + "-lwebp", + "-L$(location :WebP_lib_file)", + ], +) + +static_library( + name = "WebP", + srcs = glob([ + "WebP/*.m", + ]), + headers = [ + "WebP/UIImage+WebP.h", + ], + exported_headers = [ + "WebP/UIImage+WebP.h", + ], + deps = [ + ":WebP_lib", + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +)