Permalink
Browse files

Fix #458, #459, acknowledgements

  • Loading branch information...
1 parent 2f5ba23 commit 0393217f5457d04ea919689f3e985455531f3ebe @chrisballinger chrisballinger committed Mar 30, 2016
@@ -62,7 +62,6 @@
63E353F61BB9E46D005C54C3 /* OTRPushTLVHandlerProtocols.h in Headers */ = {isa = PBXBuildFile; fileRef = 63E353F51BB9E41D005C54C3 /* OTRPushTLVHandlerProtocols.h */; settings = {ATTRIBUTES = (Public, ); }; };
63F614DC1BB214660083A06A /* ChatSecureModelTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63F614DB1BB214660083A06A /* ChatSecureModelTest.swift */; };
63FA130C1C8A4EB700AE33EF /* OTRMessagesCollectionViewFlowLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63FA130B1C8A4EB700AE33EF /* OTRMessagesCollectionViewFlowLayout.swift */; };
- BB852C4F65587CD8A46FF428 /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CCD1F8E85C658C8D3865B584 /* Pods.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
D9227C241BA78E6B00B5E1D0 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D9227C231BA78E6B00B5E1D0 /* FontAwesome.ttf */; };
D9227C2D1BA7952100B5E1D0 /* ChatSecureCore.h in Headers */ = {isa = PBXBuildFile; fileRef = D9227C2C1BA7952100B5E1D0 /* ChatSecureCore.h */; settings = {ATTRIBUTES = (Public, ); }; };
D9227C3F1BA7952100B5E1D0 /* ChatSecureCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D9227C2A1BA7952100B5E1D0 /* ChatSecureCore.framework */; };
@@ -369,6 +368,7 @@
D99F17921BABA84600604558 /* OTRUsernameCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D9C6E69D1B7148EF00572273 /* OTRUsernameCell.xib */; };
D99F17931BABA85D00604558 /* Onboarding.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D913A56C1B747B62006C5ACD /* Onboarding.storyboard */; };
D9A3CB2C1B2798D7000A50C6 /* XMPPURITests.m in Sources */ = {isa = PBXBuildFile; fileRef = D9A3CB2B1B2798D7000A50C6 /* XMPPURITests.m */; };
+ D9AA246C1CAB401800337ECA /* GTMOAuth2ViewTouch.xib in Resources */ = {isa = PBXBuildFile; fileRef = D9AA246B1CAB401800337ECA /* GTMOAuth2ViewTouch.xib */; };
D9AE3A111BA8CBFA00255537 /* OTRAssets.h in Headers */ = {isa = PBXBuildFile; fileRef = D9AE3A101BA8CBFA00255537 /* OTRAssets.h */; settings = {ATTRIBUTES = (Public, ); }; };
D9AE3A161BA8CBFA00255537 /* OTRAssets.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D9AE3A0E1BA8CBFA00255537 /* OTRAssets.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
D9AE3A1B1BA8CC8600255537 /* OTRSecrets.m in Sources */ = {isa = PBXBuildFile; fileRef = 633105F91A16D1A300C17BAE /* OTRSecrets.m */; };
@@ -830,7 +830,7 @@
D95AD2221B67FD6A007DEBC3 /* OTRCircleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRCircleView.h; sourceTree = "<group>"; };
D95AD2231B67FD6A007DEBC3 /* OTRCircleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRCircleView.m; sourceTree = "<group>"; };
D95AD2281B684AE1007DEBC3 /* xmpp-server-list */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "xmpp-server-list"; path = "Submodules/xmpp-server-list"; sourceTree = SOURCE_ROOT; };
- D973D7051A2D4094004D353E /* Pods-acknowledgements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Pods-acknowledgements.plist"; path = "Pods/Target Support Files/Pods/Pods-acknowledgements.plist"; sourceTree = SOURCE_ROOT; };
+ D973D7051A2D4094004D353E /* Pods-ChatSecureCore-acknowledgements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Pods-ChatSecureCore-acknowledgements.plist"; path = "Pods/Target Support Files/Pods-ChatSecureCore/Pods-ChatSecureCore-acknowledgements.plist"; sourceTree = SOURCE_ROOT; };
D978BC901BABE0F4009246CF /* OTRTheme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRTheme.h; sourceTree = "<group>"; };
D978BC911BABE0F4009246CF /* OTRTheme.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRTheme.m; sourceTree = "<group>"; };
D989A84D1B5DBD90000608A9 /* OTRExistingAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OTRExistingAccountViewController.h; path = "Login View Controllers/OTRExistingAccountViewController.h"; sourceTree = "<group>"; };
@@ -840,6 +840,8 @@
D99F17891BAB946800604558 /* Branding.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Branding.plist; sourceTree = "<group>"; };
D99F178B1BAB947E00604558 /* Secrets.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Secrets.plist; sourceTree = "<group>"; };
D9A3CB2B1B2798D7000A50C6 /* XMPPURITests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XMPPURITests.m; sourceTree = "<group>"; };
+ D9AA24691CAB32CB00337ECA /* Pods_ChatSecureCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Pods_ChatSecureCore.framework; path = "../../../Library/Developer/Xcode/DerivedData/ChatSecure-bgbdueswhbvwehacitzrmgfutmci/Build/Products/Debug-iphonesimulator/Pods_ChatSecureCore.framework"; sourceTree = "<group>"; };
+ D9AA246B1CAB401800337ECA /* GTMOAuth2ViewTouch.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = GTMOAuth2ViewTouch.xib; path = "Pods/gtm-oauth2/Source/Touch/GTMOAuth2ViewTouch.xib"; sourceTree = SOURCE_ROOT; };
D9ADE5B71B606642009471FF /* OTRCircleButtonView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRCircleButtonView.h; sourceTree = "<group>"; };
D9ADE5B81B606642009471FF /* OTRCircleButtonView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRCircleButtonView.m; sourceTree = "<group>"; };
D9AE3A0E1BA8CBFA00255537 /* OTRAssets.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OTRAssets.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -864,7 +866,6 @@
buildActionMask = 2147483647;
files = (
D9227C3F1BA7952100B5E1D0 /* ChatSecureCore.framework in Frameworks */,
- BB852C4F65587CD8A46FF428 /* Pods.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -906,10 +907,11 @@
633104D71A169EE600C17BAE /* Resources */ = {
isa = PBXGroup;
children = (
+ D9AA246B1CAB401800337ECA /* GTMOAuth2ViewTouch.xib */,
633106661A16D1A300C17BAE /* LaunchScreen.xib */,
D9227C231BA78E6B00B5E1D0 /* FontAwesome.ttf */,
D95AD2281B684AE1007DEBC3 /* xmpp-server-list */,
- D973D7051A2D4094004D353E /* Pods-acknowledgements.plist */,
+ D973D7051A2D4094004D353E /* Pods-ChatSecureCore-acknowledgements.plist */,
D9365E791A1EB0050006434A /* torrc */,
633107291A16D1F200C17BAE /* DemoImages.xcassets */,
6331072A1A16D1F200C17BAE /* Images.xcassets */,
@@ -1594,6 +1596,7 @@
DB9AACD6ED82090C7A6B0076 /* Frameworks */ = {
isa = PBXGroup;
children = (
+ D9AA24691CAB32CB00337ECA /* Pods_ChatSecureCore.framework */,
CCD1F8E85C658C8D3865B584 /* Pods.framework */,
9B353F12AE2FDB52438B426D /* Pods_ChatSecureCore.framework */,
);
@@ -1987,6 +1990,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ D9AA246C1CAB401800337ECA /* GTMOAuth2ViewTouch.xib in Resources */,
D99F178E1BAB9B2100604558 /* OTRResources.bundle in Resources */,
D9227C241BA78E6B00B5E1D0 /* FontAwesome.ttf in Resources */,
6331072C1A16D1F200C17BAE /* Images.xcassets in Resources */,
@@ -2676,7 +2680,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.chrisballinger.ChatSecure;
PRODUCT_NAME = "$(TARGET_NAME)";
- PROVISIONING_PROFILE = "";
+ PROVISIONING_PROFILE = "9988a231-5968-492c-b874-2e5e534a8710";
};
name = Release;
};
@@ -2738,6 +2742,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
+ EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = ChatSecureCore/Info.plist;
INSTALL_PATH = ../;
@@ -2767,6 +2772,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
+ EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = ChatSecureCore/Info.plist;
INSTALL_PATH = ../;
@@ -2795,6 +2801,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
+ EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = ChatSecureCore/Info.plist;
INSTALL_PATH = ../;
@@ -2815,6 +2822,7 @@
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
+ EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = OTRResources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -2834,6 +2842,7 @@
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = OTRResources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -2853,6 +2862,7 @@
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = OTRResources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
@@ -2877,11 +2887,13 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
+ EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = OTRAssets/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+ OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = org.chatsecure.OTRAssets;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
@@ -2904,11 +2916,13 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
+ EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = OTRAssets/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+ OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = org.chatsecure.OTRAssets;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
@@ -2931,11 +2945,13 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
+ EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = OTRAssets/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+ OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = org.chatsecure.OTRAssets;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
Oops, something went wrong.

0 comments on commit 0393217

Please sign in to comment.