diff --git a/App/App.xcodeproj/project.pbxproj b/App/App.xcodeproj/project.pbxproj index 635dc68348..c4322736fc 100644 --- a/App/App.xcodeproj/project.pbxproj +++ b/App/App.xcodeproj/project.pbxproj @@ -263,31 +263,31 @@ explicitFileType archive.ar - 1DD70E29A59C927400000000 + 1DD70E2987C9226300000000 isa PBXFileReference name - libEmoji.a + libEmoji.dylib path - libEmoji.a + libEmoji.dylib sourceTree BUILT_PRODUCTS_DIR explicitFileType - archive.ar + compiled.mach-o.dylib - 1DD70E29C4DF1A6D00000000 + 1DD70E29B22505DC00000000 isa PBXFileReference name - libMtProtoKit.a + libMtProtoKit.dylib path - libMtProtoKit.a + libMtProtoKit.dylib sourceTree BUILT_PRODUCTS_DIR explicitFileType - archive.ar + compiled.mach-o.dylib B401C97968022A5500000000 @@ -300,8 +300,8 @@ children 1DD70E297ADFB9F200000000 - 1DD70E29A59C927400000000 - 1DD70E29C4DF1A6D00000000 + 1DD70E2987C9226300000000 + 1DD70E29B22505DC00000000 1DD70E2933D47CB400000000 @@ -384,19 +384,19 @@ fileRef 1DD70E297ADFB9F200000000 - E7A30F04A59C927400000000 + E7A30F0487C9226300000000 isa PBXBuildFile fileRef - 1DD70E29A59C927400000000 + 1DD70E2987C9226300000000 - E7A30F04C4DF1A6D00000000 + E7A30F04B22505DC00000000 isa PBXBuildFile fileRef - 1DD70E29C4DF1A6D00000000 + 1DD70E29B22505DC00000000 4F426D880000000000000000 @@ -405,10 +405,54 @@ files E7A30F047ADFB9F200000000 - E7A30F04A59C927400000000 - E7A30F04C4DF1A6D00000000 + E7A30F0487C9226300000000 + E7A30F04B22505DC00000000 + E7A30F0487C9226300000001 + + isa + PBXBuildFile + fileRef + 1DD70E2987C9226300000000 + settings + + ATTRIBUTES + + CodeSignOnCopy + RemoveHeadersOnCopy + + + + E7A30F04B22505DC00000001 + + isa + PBXBuildFile + fileRef + 1DD70E29B22505DC00000000 + settings + + ATTRIBUTES + + CodeSignOnCopy + RemoveHeadersOnCopy + + + + FAF5FAC90000000000000000 + + isa + PBXCopyFilesBuildPhase + files + + E7A30F0487C9226300000001 + E7A30F04B22505DC00000001 + + dstSubfolderSpec + 10 + dstPath + + 4952437303EDA63300000000 isa @@ -477,6 +521,7 @@ 1870857F0000000000000000 4F426D880000000000000000 + FAF5FAC90000000000000000 buildConfigurationList 218C37090000000000000000 @@ -505,20 +550,20 @@ E7A30F048FA05E8C00000000 - E7A30F04A59C927400000001 + E7A30F0487C9226300000002 isa PBXBuildFile fileRef - 1DD70E29A59C927400000000 + 1DD70E2987C9226300000000 - FAF5FAC90000000000000000 + FAF5FAC90000000000000001 isa PBXCopyFilesBuildPhase files - E7A30F04A59C927400000001 + E7A30F0487C9226300000002 name Fake Swift Dependencies (Copy Files Phase) @@ -596,7 +641,7 @@ buildPhases 1870857F0000000000000001 - FAF5FAC90000000000000000 + FAF5FAC90000000000000001 buildConfigurationList 218C37090000000000000001 diff --git a/App/App.xcworkspace/buck-project.meta.json b/App/App.xcworkspace/buck-project.meta.json index d321a6041c..4f50c846ae 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-Debug.xcconfig","buck-out/gen/submodules/Emoji/Emoji-Profile.xcconfig","buck-out/gen/submodules/Emoji/Emoji-Release.xcconfig","buck-out/gen/submodules/MtProtoKit/MtProtoKit-Debug.xcconfig","buck-out/gen/submodules/MtProtoKit/MtProtoKit-Profile.xcconfig","buck-out/gen/submodules/MtProtoKit/MtProtoKit-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/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 diff --git a/App/App.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/App/App.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000000..18d981003d --- /dev/null +++ b/App/App.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/App/App.xcworkspace/xcshareddata/xcschemes/App.xcscheme b/App/App.xcworkspace/xcshareddata/xcschemes/App.xcscheme index ca1f27f58a..b87a16666f 100644 --- a/App/App.xcworkspace/xcshareddata/xcschemes/App.xcscheme +++ b/App/App.xcworkspace/xcshareddata/xcschemes/App.xcscheme @@ -1 +1,138 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/App/BUCK b/App/BUCK index 107c0047ea..1db0e9b759 100644 --- a/App/BUCK +++ b/App/BUCK @@ -80,6 +80,7 @@ apple_bundle( info_plist = "Info.plist", info_plist_substitutions = app_info_plist_substitutions("App"), deps = [ + "//submodules/Emoji:EmojiFiles", ] + framework_bundle_dependencies(framework_dependencies), ) diff --git a/Config/buck_rule_macros.bzl b/Config/buck_rule_macros.bzl index 0c18780fff..a1142324de 100644 --- a/Config/buck_rule_macros.bzl +++ b/Config/buck_rule_macros.bzl @@ -15,6 +15,7 @@ def apple_lib( exported_headers = [], extra_xcode_files = [], deps = [], + exported_deps = [], frameworks = [], swift_version = None, modular = True, @@ -47,6 +48,7 @@ def apple_lib( headers = headers, exported_headers = exported_headers, deps = deps, + exported_deps = exported_deps, extra_xcode_files = extra_xcode_files, frameworks = frameworks, visibility = visibility, @@ -57,24 +59,19 @@ def apple_lib( swift_compiler_flags = swift_compiler_flags, preferred_linkage = "shared", link_style = "static", - linker_flags = ["-Wl,-install_name,@rpath/%sFramework.framework/%sFramework" % (name, 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), + #linker_flags = ["-Wl,-install_name,@rpath/%sFramework.framework/%sFramework" % (name, name)], + linker_flags = ["-Wl,-install_name,@rpath/lib%s.dylib" % (name)], ) else: native.apple_library( - name = name, + name = name + "", srcs = srcs, header_namespace = name, + module_name = name, headers = headers, exported_headers = exported_headers, deps = deps, + exported_deps = exported_deps, extra_xcode_files = extra_xcode_files, frameworks = frameworks, visibility = visibility, @@ -85,15 +82,8 @@ def apple_lib( swift_compiler_flags = swift_compiler_flags, preferred_linkage = "shared", link_style = "static", - linker_flags = ["-Wl,-install_name,@rpath/%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), + #linker_flags = ["-Wl,-install_name,@rpath/%sFramework.framework/%sFramework" % (name, name)], + linker_flags = ["-Wl,-install_name,@rpath/lib%s.dylib" % (name)], ) else: native.apple_library( @@ -152,6 +142,7 @@ def framework( exported_headers = [], extra_xcode_files = [], deps = [], + exported_deps = [], frameworks = [], info_plist = None, info_plist_substitutions = {}, @@ -171,6 +162,7 @@ def framework( swift_compiler_flags = swift_compiler_flags, extra_xcode_files = extra_xcode_files, deps = deps, + exported_deps = exported_deps, frameworks = frameworks, warning_as_error = warning_as_error, suppress_warnings = suppress_warnings, @@ -214,7 +206,7 @@ def framework_binary_dependencies(names): result = [] if native.read_config("custom", "mode") == "project": for name in names: - result.append(name + "") + result.append(name + "#shared") else: for name in names: result.append(name + "#shared") @@ -228,6 +220,6 @@ def framework_bundle_dependencies(names): pass else: for name in names: - result.append(name + "Framework") + #result.append(name + "Framework") pass return result diff --git a/Config/configs.bzl b/Config/configs.bzl index f735c1cda4..c593b027dd 100644 --- a/Config/configs.bzl +++ b/Config/configs.bzl @@ -71,6 +71,7 @@ def framework_library_configs(name): "SKIP_INSTALL": "YES", "MACH_O_TYPE": "mh_dylib", "PRODUCT_BUNDLE_IDENTIFIER": bundle_identifier(name), + "CODE_SIGNING_ALLOWED": "NO", } library_config = merge_dict(SHARED_CONFIGS, lib_specific_config) diff --git a/Makefile b/Makefile index cffc327977..69ff344838 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ .PHONY : install_buck build targets audit project clean -BUCK=/Users/peter/build/buck/buck-out/gen/programs/buck.pex +BUCK=/Users/peter/build/buck-next/buck/buck-out/gen/programs/buck.pex log: echo "Make" diff --git a/submodules/Emoji/BUCK b/submodules/Emoji/BUCK index 75f05b54fa..7fdf3a58b9 100644 --- a/submodules/Emoji/BUCK +++ b/submodules/Emoji/BUCK @@ -1,12 +1,20 @@ load("//Config:buck_rule_macros.bzl", "static_library", "framework") +apple_resource( + name = 'EmojiFiles', + dirs = [ + "TestFolder.bundle", + ], + visibility = [ + "PUBLIC", + ], +) + framework( name = "Emoji", srcs = glob([ "Sources/*.swift", ]), - deps = [ - ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", "$SDKROOT/System/Library/Frameworks/CoreText.framework", diff --git a/submodules/Emoji/Emoji.d b/submodules/Emoji/Emoji.d deleted file mode 100644 index 4d85181083..0000000000 --- a/submodules/Emoji/Emoji.d +++ /dev/null @@ -1,4 +0,0 @@ -/Users/peter/build/telegram-temp/telegram-ios/submodules/Emoji/Emoji.o : /Users/peter/build/telegram-temp/telegram-ios/submodules/Emoji/Sources/EmojiUtils.swift /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/ObjectiveC.swiftmodule /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/Dispatch.swiftmodule /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/Darwin.swiftmodule /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/Foundation.swiftmodule /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/CoreFoundation.swiftmodule /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/CoreGraphics.swiftmodule /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/Swift.swiftmodule /Users/peter/build/telegram-temp/telegram-ios/submodules/Emoji/../../buck-out/gen/_p/dSOeJSgEqx-pub/Emoji/module.modulemap /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator12.4.sdk/usr/include/objc/ObjectiveC.apinotes /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/Dispatch.apinotes /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator12.4.sdk/usr/include/Darwin.apinotes /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator12.4.sdk/System/Library/Frameworks/Foundation.framework/Headers/Foundation.apinotes /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator12.4.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CoreGraphics.apinotes /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator12.4.sdk/System/Library/Frameworks/CoreText.framework/Headers/CoreText.apinotes /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator12.4.sdk/System/Library/Frameworks/Security.framework/Headers/Security.apinotes -/Users/peter/Library/Developer/Xcode/DerivedData/AppBundle-eiyupsfslxdyqrgylgpylqedpick/Build/Intermediates.noindex/Emoji.build/Debug-iphonesimulator/EmojiFramework.build/Objects-normal/x86_64/Emoji.swiftmodule : /Users/peter/build/telegram-temp/telegram-ios/submodules/Emoji/Sources/EmojiUtils.swift /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/ObjectiveC.swiftmodule /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/Dispatch.swiftmodule /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/Darwin.swiftmodule /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/Foundation.swiftmodule /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/CoreFoundation.swiftmodule /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/CoreGraphics.swiftmodule /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/Swift.swiftmodule /Users/peter/build/telegram-temp/telegram-ios/submodules/Emoji/../../buck-out/gen/_p/dSOeJSgEqx-pub/Emoji/module.modulemap /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator12.4.sdk/usr/include/objc/ObjectiveC.apinotes /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/Dispatch.apinotes /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator12.4.sdk/usr/include/Darwin.apinotes /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator12.4.sdk/System/Library/Frameworks/Foundation.framework/Headers/Foundation.apinotes /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator12.4.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CoreGraphics.apinotes /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator12.4.sdk/System/Library/Frameworks/CoreText.framework/Headers/CoreText.apinotes /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator12.4.sdk/System/Library/Frameworks/Security.framework/Headers/Security.apinotes -/Users/peter/Library/Developer/Xcode/DerivedData/AppBundle-eiyupsfslxdyqrgylgpylqedpick/Build/Intermediates.noindex/Emoji.build/Debug-iphonesimulator/EmojiFramework.build/Objects-normal/x86_64/Emoji.swiftdoc : /Users/peter/build/telegram-temp/telegram-ios/submodules/Emoji/Sources/EmojiUtils.swift /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/ObjectiveC.swiftmodule /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/Dispatch.swiftmodule /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/Darwin.swiftmodule /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/Foundation.swiftmodule /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/CoreFoundation.swiftmodule /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/CoreGraphics.swiftmodule /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/Swift.swiftmodule /Users/peter/build/telegram-temp/telegram-ios/submodules/Emoji/../../buck-out/gen/_p/dSOeJSgEqx-pub/Emoji/module.modulemap /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator12.4.sdk/usr/include/objc/ObjectiveC.apinotes /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/Dispatch.apinotes /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator12.4.sdk/usr/include/Darwin.apinotes /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator12.4.sdk/System/Library/Frameworks/Foundation.framework/Headers/Foundation.apinotes /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator12.4.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CoreGraphics.apinotes /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator12.4.sdk/System/Library/Frameworks/CoreText.framework/Headers/CoreText.apinotes /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator12.4.sdk/System/Library/Frameworks/Security.framework/Headers/Security.apinotes -/Users/peter/Library/Developer/Xcode/DerivedData/AppBundle-eiyupsfslxdyqrgylgpylqedpick/Build/Intermediates.noindex/Emoji.build/Debug-iphonesimulator/EmojiFramework.build/Objects-normal/x86_64/EmojiFramework-Swift.h : /Users/peter/build/telegram-temp/telegram-ios/submodules/Emoji/Sources/EmojiUtils.swift /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/ObjectiveC.swiftmodule /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/Dispatch.swiftmodule /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/Darwin.swiftmodule /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/Foundation.swiftmodule /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/CoreFoundation.swiftmodule /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/CoreGraphics.swiftmodule /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/Swift.swiftmodule /Users/peter/build/telegram-temp/telegram-ios/submodules/Emoji/../../buck-out/gen/_p/dSOeJSgEqx-pub/Emoji/module.modulemap /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator12.4.sdk/usr/include/objc/ObjectiveC.apinotes /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator/x86_64/Dispatch.apinotes /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator12.4.sdk/usr/include/Darwin.apinotes /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator12.4.sdk/System/Library/Frameworks/Foundation.framework/Headers/Foundation.apinotes /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator12.4.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CoreGraphics.apinotes /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator12.4.sdk/System/Library/Frameworks/CoreText.framework/Headers/CoreText.apinotes /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator12.4.sdk/System/Library/Frameworks/Security.framework/Headers/Security.apinotes diff --git a/submodules/Emoji/Emoji.o b/submodules/Emoji/Emoji.o deleted file mode 100644 index ae870d4386..0000000000 Binary files a/submodules/Emoji/Emoji.o and /dev/null differ diff --git a/submodules/Emoji/Emoji.xcodeproj/project.pbxproj b/submodules/Emoji/Emoji.xcodeproj/project.pbxproj index b9c4156b4b..2bf845743c 100644 --- a/submodules/Emoji/Emoji.xcodeproj/project.pbxproj +++ b/submodules/Emoji/Emoji.xcodeproj/project.pbxproj @@ -11,40 +11,40 @@ 46 objects - 1DD70E29CCF717CF00000000 + 1DD70E2987F4E91300000000 isa PBXFileReference name - Emoji-Debug.xcconfig + Emoji#shared-Debug.xcconfig path - ../../buck-out/gen/submodules/Emoji/Emoji-Debug.xcconfig + ../../buck-out/gen/submodules/Emoji/Emoji#shared-Debug.xcconfig sourceTree SOURCE_ROOT explicitFileType text.xcconfig - 1DD70E2950B2F77900000000 + 1DD70E29438187BD00000000 isa PBXFileReference name - Emoji-Profile.xcconfig + Emoji#shared-Profile.xcconfig path - ../../buck-out/gen/submodules/Emoji/Emoji-Profile.xcconfig + ../../buck-out/gen/submodules/Emoji/Emoji#shared-Profile.xcconfig sourceTree SOURCE_ROOT explicitFileType text.xcconfig - 1DD70E29C449A2DB00000000 + 1DD70E29B718331F00000000 isa PBXFileReference name - Emoji-Release.xcconfig + Emoji#shared-Release.xcconfig path - ../../buck-out/gen/submodules/Emoji/Emoji-Release.xcconfig + ../../buck-out/gen/submodules/Emoji/Emoji#shared-Release.xcconfig sourceTree SOURCE_ROOT explicitFileType @@ -60,9 +60,9 @@ ]]> children - 1DD70E29CCF717CF00000000 - 1DD70E2950B2F77900000000 - 1DD70E29C449A2DB00000000 + 1DD70E2987F4E91300000000 + 1DD70E29438187BD00000000 + 1DD70E29B718331F00000000 B401C979B781F65D00000000 @@ -91,6 +91,32 @@ explicitFileType text.script.python + 1DD70E29E7E32A7000000000 + + isa + PBXFileReference + name + TestFolder.bundle + path + TestFolder.bundle + sourceTree + SOURCE_ROOT + explicitFileType + wrapper.cfbundle + + B401C979013EDE0500000000 + + isa + PBXGroup + name + Resources + sourceTree + ]]> + children + + 1DD70E29E7E32A7000000000 + + 1DD70E29C4C3D69000000000 isa @@ -115,32 +141,87 @@ 1DD70E29C4C3D69000000000 - B401C97903FF902600000000 + B401C9796969DF6200000000 isa PBXGroup name - Emoji + Emoji#shared sourceTree ]]> children 1DD70E29001F47FB00000000 + B401C979013EDE0500000000 B401C979EAB5339800000000 - 1DD70E29A59C927400000000 + 1DD70E291188565800000000 isa PBXFileReference name - libEmoji.a + AVFoundation.framework path - libEmoji.a + 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 - archive.ar + compiled.mach-o.dylib B401C979C806358400000000 @@ -152,7 +233,7 @@ ]]> children - 1DD70E29A59C927400000000 + 1DD70E2987C9226300000000 B401C979EFB6AC4600000000 @@ -166,7 +247,8 @@ children B401C979B781F65D00000000 - B401C97903FF902600000000 + B401C9796969DF6200000000 + B401C97968022A5500000000 B401C979C806358400000000 @@ -186,6 +268,38 @@ E7A30F04C4C3D69000000000 + E7A30F041188565800000000 + + isa + PBXBuildFile + fileRef + 1DD70E291188565800000000 + + E7A30F04A179AC1C00000000 + + isa + PBXBuildFile + fileRef + 1DD70E29A179AC1C00000000 + + E7A30F04AE317AA300000000 + + isa + PBXBuildFile + fileRef + 1DD70E29AE317AA300000000 + + 4F426D880000000000000000 + + isa + PBXFrameworksBuildPhase + files + + E7A30F041188565800000000 + E7A30F04A179AC1C00000000 + E7A30F04AE317AA300000000 + + 4952437303EDA63300000000 isa @@ -196,7 +310,7 @@ baseConfigurationReference - 1DD70E29CCF717CF00000000 + 1DD70E2987F4E91300000000 4952437350C7218900000000 @@ -208,7 +322,7 @@ baseConfigurationReference - 1DD70E2950B2F77900000000 + 1DD70E29438187BD00000000 49524373A439BFE700000000 @@ -220,7 +334,7 @@ baseConfigurationReference - 1DD70E29C449A2DB00000000 + 1DD70E29B718331F00000000 218C37090000000000000000 @@ -235,24 +349,25 @@ defaultConfigurationIsVisible - E66DC04E03FF902600000000 + E66DC04E6969DF6200000000 isa PBXNativeTarget name - Emoji + Emoji#shared productName Emoji productReference - 1DD70E29A59C927400000000 + 1DD70E2987C9226300000000 productType - com.apple.product-type.library.static + com.apple.product-type.library.dynamic dependencies buildPhases 1870857F0000000000000000 + 4F426D880000000000000000 buildConfigurationList 218C37090000000000000000 @@ -308,7 +423,7 @@ B401C979EFB6AC4600000000 targets - E66DC04E03FF902600000000 + E66DC04E6969DF6200000000 buildConfigurationList 218C37090000000000000001 diff --git a/submodules/Emoji/Emoji.xcodeproj/xcshareddata/xcschemes/Emoji.xcscheme b/submodules/Emoji/Emoji.xcodeproj/xcshareddata/xcschemes/Emoji.xcscheme index c4eb6b0a83..6a43507ec1 100644 --- a/submodules/Emoji/Emoji.xcodeproj/xcshareddata/xcschemes/Emoji.xcscheme +++ b/submodules/Emoji/Emoji.xcodeproj/xcshareddata/xcschemes/Emoji.xcscheme @@ -1 +1,71 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/submodules/Emoji/TestFolder.bundle/TestFile.txt b/submodules/Emoji/TestFolder.bundle/TestFile.txt new file mode 100644 index 0000000000..e1fe4cfb7b --- /dev/null +++ b/submodules/Emoji/TestFolder.bundle/TestFile.txt @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + +