diff --git a/App/App.xcodeproj/project.pbxproj b/App/App.xcodeproj/project.pbxproj index 5b40766415..2569c9160a 100644 --- a/App/App.xcodeproj/project.pbxproj +++ b/App/App.xcodeproj/project.pbxproj @@ -263,6 +263,19 @@ explicitFileType wrapper.framework + 1DD70E296A34811900000000 + + isa + PBXFileReference + name + MtProtoKitFramework.framework + path + MtProtoKitFramework.framework + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + wrapper.framework + 1DD70E297ADFB9F200000000 isa @@ -287,6 +300,7 @@ children 1DD70E29FC2E5C0800000000 + 1DD70E296A34811900000000 1DD70E297ADFB9F200000000 @@ -370,6 +384,13 @@ fileRef 1DD70E29FC2E5C0800000000 + E7A30F046A34811900000000 + + isa + PBXBuildFile + fileRef + 1DD70E296A34811900000000 + E7A30F047ADFB9F200000000 isa @@ -384,6 +405,7 @@ files E7A30F04FC2E5C0800000000 + E7A30F046A34811900000000 E7A30F047ADFB9F200000000 @@ -402,6 +424,21 @@ + E7A30F046A34811900000001 + + isa + PBXBuildFile + fileRef + 1DD70E296A34811900000000 + settings + + ATTRIBUTES + + CodeSignOnCopy + RemoveHeadersOnCopy + + + FAF5FAC90000000000000000 isa @@ -409,6 +446,7 @@ files E7A30F04FC2E5C0800000001 + E7A30F046A34811900000001 dstSubfolderSpec 10 diff --git a/App/App.xcworkspace/buck-project.meta.json b/App/App.xcworkspace/buck-project.meta.json index cd9335add6..23f3c924bc 100644 --- a/App/App.xcworkspace/buck-project.meta.json +++ b/App/App.xcworkspace/buck-project.meta.json @@ -1 +1 @@ -{"required-targets":[],"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/EmojiFramework#iphonesimulator-x86_64-Debug.xcconfig","buck-out/gen/submodules/Emoji/EmojiFramework#iphonesimulator-x86_64-Profile.xcconfig","buck-out/gen/submodules/Emoji/EmojiFramework#iphonesimulator-x86_64-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/EmojiFramework-Debug.xcconfig","buck-out/gen/submodules/Emoji/EmojiFramework-Profile.xcconfig","buck-out/gen/submodules/Emoji/EmojiFramework-Release.xcconfig","buck-out/gen/submodules/MtProtoKit/MtProtoKitFramework-Debug.xcconfig","buck-out/gen/submodules/MtProtoKit/MtProtoKitFramework-Profile.xcconfig","buck-out/gen/submodules/MtProtoKit/MtProtoKitFramework-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/contents.xcworkspacedata b/App/App.xcworkspace/contents.xcworkspacedata index f43dd2832e..9d9843e511 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 ca41432aa1..5786b82635 100644 --- a/App/App.xcworkspace/xcshareddata/xcschemes/App.xcscheme +++ b/App/App.xcworkspace/xcshareddata/xcschemes/App.xcscheme @@ -1,110 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/App/BUCK b/App/BUCK index 4e2bdf24a4..107c0047ea 100644 --- a/App/BUCK +++ b/App/BUCK @@ -20,7 +20,7 @@ ui_tests = [ static_library_dependencies = [ ] framework_dependencies = [ - #'//submodules/MtProtoKit:MtProtoKit', + '//submodules/MtProtoKit:MtProtoKit', '//submodules/Emoji:Emoji', ] diff --git a/App/Sources/TempMain.m b/App/Sources/TempMain.m index ef24fc1604..2011a35904 100644 --- a/App/Sources/TempMain.m +++ b/App/Sources/TempMain.m @@ -1,6 +1,6 @@ #import #import -//#import +#import @interface AppDelegate : NSObject @@ -21,7 +21,7 @@ @end int main(int argc, const char **argv) { - //MTProto *mtProto = [[MTProto alloc] init]; + MTProto *mtProto = [[MTProto alloc] init]; @autoreleasepool { return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); } diff --git a/Config/buck_rule_macros.bzl b/Config/buck_rule_macros.bzl index 92b4be682f..78480ff82f 100644 --- a/Config/buck_rule_macros.bzl +++ b/Config/buck_rule_macros.bzl @@ -40,9 +40,10 @@ def apple_lib( if framework: if native.read_config("custom", "mode") == "project": native.apple_library( - name = name, + name = name + "", srcs = srcs, header_namespace = name, + #module_name = name, headers = headers, exported_headers = exported_headers, deps = deps, @@ -60,6 +61,7 @@ def apple_lib( ) native.apple_bundle( name = name + "Framework", + #module_name = name, visibility = visibility, binary = ":" + name + "#shared", extension = "framework", @@ -84,7 +86,7 @@ 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)], + linker_flags = ["-Wl,-install_name,@rpath/%s.dylib" % (name)], ) native.apple_bundle( name = name + "Framework", @@ -223,7 +225,7 @@ def framework_bundle_dependencies(names): result = [] if native.read_config("custom", "mode") == "project": for name in names: - result.append(name + "Framework") + #result.append(name + "#shared") pass else: for name in names: diff --git a/submodules/Emoji/Emoji.xcodeproj/project.pbxproj b/submodules/Emoji/Emoji.xcodeproj/project.pbxproj index 1da395e946..eb4705230e 100644 --- a/submodules/Emoji/Emoji.xcodeproj/project.pbxproj +++ b/submodules/Emoji/Emoji.xcodeproj/project.pbxproj @@ -11,40 +11,40 @@ 46 objects - 1DD70E292187879500000000 + 1DD70E29DC16ED3D00000000 isa PBXFileReference name - EmojiFramework#iphonesimulator-x86_64-Debug.xcconfig + EmojiFramework-Debug.xcconfig path - ../../buck-out/gen/submodules/Emoji/EmojiFramework#iphonesimulator-x86_64-Debug.xcconfig + ../../buck-out/gen/submodules/Emoji/EmojiFramework-Debug.xcconfig sourceTree SOURCE_ROOT explicitFileType text.xcconfig - 1DD70E29C2E68DBF00000000 + 1DD70E291733296700000000 isa PBXFileReference name - EmojiFramework#iphonesimulator-x86_64-Profile.xcconfig + EmojiFramework-Profile.xcconfig path - ../../buck-out/gen/submodules/Emoji/EmojiFramework#iphonesimulator-x86_64-Profile.xcconfig + ../../buck-out/gen/submodules/Emoji/EmojiFramework-Profile.xcconfig sourceTree SOURCE_ROOT explicitFileType text.xcconfig - 1DD70E29367D392100000000 + 1DD70E298AC9D4C900000000 isa PBXFileReference name - EmojiFramework#iphonesimulator-x86_64-Release.xcconfig + EmojiFramework-Release.xcconfig path - ../../buck-out/gen/submodules/Emoji/EmojiFramework#iphonesimulator-x86_64-Release.xcconfig + ../../buck-out/gen/submodules/Emoji/EmojiFramework-Release.xcconfig sourceTree SOURCE_ROOT explicitFileType @@ -60,9 +60,9 @@ ]]> children - 1DD70E292187879500000000 - 1DD70E29C2E68DBF00000000 - 1DD70E29367D392100000000 + 1DD70E29DC16ED3D00000000 + 1DD70E291733296700000000 + 1DD70E298AC9D4C900000000 B401C979B781F65D00000000 @@ -129,12 +129,12 @@ 1DD70E2906C06BEE00000000 - B401C97920924D2000000000 + B401C97935694C7800000000 isa PBXGroup name - EmojiFramework#iphonesimulator-x86_64 + EmojiFramework sourceTree ]]> children @@ -234,7 +234,7 @@ children B401C979B781F65D00000000 - B401C97920924D2000000000 + B401C97935694C7800000000 B401C97968022A5500000000 B401C979C806358400000000 @@ -297,7 +297,7 @@ baseConfigurationReference - 1DD70E292187879500000000 + 1DD70E29DC16ED3D00000000 4952437350C7218900000000 @@ -309,7 +309,7 @@ baseConfigurationReference - 1DD70E29C2E68DBF00000000 + 1DD70E291733296700000000 49524373A439BFE700000000 @@ -321,7 +321,7 @@ baseConfigurationReference - 1DD70E29367D392100000000 + 1DD70E298AC9D4C900000000 218C37090000000000000000 @@ -336,12 +336,12 @@ defaultConfigurationIsVisible - E66DC04E20924D2000000000 + E66DC04E35694C7800000000 isa PBXNativeTarget name - EmojiFramework#iphonesimulator-x86_64 + EmojiFramework productName EmojiFramework productReference @@ -410,7 +410,7 @@ B401C979EFB6AC4600000000 targets - E66DC04E20924D2000000000 + E66DC04E35694C7800000000 buildConfigurationList 218C37090000000000000001 diff --git a/submodules/Emoji/Emoji.xcodeproj/xcshareddata/xcschemes/Emoji.xcscheme b/submodules/Emoji/Emoji.xcodeproj/xcshareddata/xcschemes/Emoji.xcscheme index c038b187d4..e43958deb3 100644 --- a/submodules/Emoji/Emoji.xcodeproj/xcshareddata/xcschemes/Emoji.xcscheme +++ b/submodules/Emoji/Emoji.xcodeproj/xcshareddata/xcschemes/Emoji.xcscheme @@ -1,71 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file