Commit f12adfde authored by Felix Paul Kühne's avatar Felix Paul Kühne

patches: remove them all

parent 68fa7496
diff -ru Dropbox/DropboxSDK/Classes/DBSession+iOS.m Dropbox/DropboxSDK/Classes/DBSession+iOS.m
--- Dropbox/DropboxSDK/Classes/DBSession+iOS.m 2014-09-15 12:51:34.000000000 +0200
+++ Dropbox/DropboxSDK/Classes/DBSession+iOS.m 2015-11-12 14:32:51.000000000 +0100
@@ -10,7 +10,9 @@
#import <CommonCrypto/CommonDigest.h>
+#if TARGET_OS_IOS
#import "DBConnectController.h"
+#endif
#import "DBLog.h"
@@ -94,7 +96,9 @@
urlStr = [NSString stringWithFormat:@"%@?k=%@&s=%@&state=%@%@",
dbURL, consumerKey, secret, nonce, userIdStr];
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:urlStr]];
- } else {
+ }
+#if TARGET_OS_IOS
+ else {
urlStr = [NSString stringWithFormat:@"%@://%@/%@/connect_login?k=%@&s=%@&state=%@&easl=1%@",
kDBProtocolHTTPS, kDBDropboxWebHost, kDBDropboxAPIVersion,
consumerKey, secret, nonce, userIdStr];
@@ -107,6 +111,7 @@
[rootController presentModalViewController:navController animated:YES];
}
+#endif
}
- (void)linkFromController:(UIViewController *)rootController {
diff -ru Dropbox/DropboxSDK/Classes/DropboxSDK-Info.plist Dropbox/DropboxSDK/Classes/DropboxSDK-Info.plist
--- Dropbox/DropboxSDK/Classes/DropboxSDK-Info.plist 2014-09-15 12:51:34.000000000 +0200
+++ Dropbox/DropboxSDK/Classes/DropboxSDK-Info.plist 2015-11-14 14:52:21.000000000 +0100
@@ -42,5 +42,9 @@
<string></string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2011 Dropbox Inc. All rights reserved.</string>
+ <key>UIRequiredDeviceCapabilities</key>
+ <array>
+ <string>arm64</string>
+ </array>
</dict>
</plist>
diff -ru Dropbox/DropboxSDK/DropboxSDK.xcodeproj/project.pbxproj Dropbox/DropboxSDK/DropboxSDK.xcodeproj/project.pbxproj
--- Dropbox/DropboxSDK/DropboxSDK.xcodeproj/project.pbxproj 2014-09-15 12:51:34.000000000 +0200
+++ Dropbox/DropboxSDK/DropboxSDK.xcodeproj/project.pbxproj 2015-11-14 14:52:21.000000000 +0100
@@ -7,6 +7,84 @@
objects = {
/* Begin PBXBuildFile section */
+ 7DEC0DD21BD7C38200A32C79 /* DBAccountInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = D387581214135C3E0013E17C /* DBAccountInfo.m */; };
+ 7DEC0DD51BD7C38200A32C79 /* DBDeltaEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F47306151F8FA10041AA64 /* DBDeltaEntry.m */; };
+ 7DEC0DD61BD7C38200A32C79 /* DBError.m in Sources */ = {isa = PBXBuildFile; fileRef = D387581414135C3E0013E17C /* DBError.m */; };
+ 7DEC0DD71BD7C38200A32C79 /* DBKeychain-iOS.m in Sources */ = {isa = PBXBuildFile; fileRef = D38B090B15329C2D00BFE072 /* DBKeychain-iOS.m */; };
+ 7DEC0DD91BD7C38200A32C79 /* DBLog.m in Sources */ = {isa = PBXBuildFile; fileRef = D387581614135C3E0013E17C /* DBLog.m */; };
+ 7DEC0DDA1BD7C38200A32C79 /* DBMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = D387581714135C3E0013E17C /* DBMetadata.m */; };
+ 7DEC0DDB1BD7C38200A32C79 /* DBQuota.m in Sources */ = {isa = PBXBuildFile; fileRef = D387581814135C3E0013E17C /* DBQuota.m */; };
+ 7DEC0DDC1BD7C38200A32C79 /* DBRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = D387581914135C3E0013E17C /* DBRequest.m */; };
+ 7DEC0DDD1BD7C38200A32C79 /* DBRestClient.m in Sources */ = {isa = PBXBuildFile; fileRef = D387581A14135C3E0013E17C /* DBRestClient.m */; };
+ 7DEC0DDF1BD7C38200A32C79 /* DBSession.m in Sources */ = {isa = PBXBuildFile; fileRef = D387581B14135C3E0013E17C /* DBSession.m */; };
+ 7DEC0DE01BD7C38200A32C79 /* DBSession+iOS.m in Sources */ = {isa = PBXBuildFile; fileRef = D33A120B1527C21700D3BC28 /* DBSession+iOS.m */; };
+ 7DEC0DE11BD7C39800A32C79 /* NSObject+DBJSON.m in Sources */ = {isa = PBXBuildFile; fileRef = D387584814135C3E0013E17C /* NSObject+DBJSON.m */; };
+ 7DEC0DE21BD7C39800A32C79 /* NSString+DBJSON.m in Sources */ = {isa = PBXBuildFile; fileRef = D387584914135C3E0013E17C /* NSString+DBJSON.m */; };
+ 7DEC0DE31BD7C39800A32C79 /* DBJSON.m in Sources */ = {isa = PBXBuildFile; fileRef = D387584A14135C3E0013E17C /* DBJSON.m */; };
+ 7DEC0DE41BD7C39800A32C79 /* DBJsonBase.m in Sources */ = {isa = PBXBuildFile; fileRef = D387584B14135C3E0013E17C /* DBJsonBase.m */; };
+ 7DEC0DE51BD7C39800A32C79 /* DBJsonParser.m in Sources */ = {isa = PBXBuildFile; fileRef = D387584C14135C3E0013E17C /* DBJsonParser.m */; };
+ 7DEC0DE61BD7C39800A32C79 /* DBJsonWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = D387584D14135C3E0013E17C /* DBJsonWriter.m */; };
+ 7DEC0DE71BD7C3A400A32C79 /* MPOAuthAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = D387585114135C3E0013E17C /* MPOAuthAPI.m */; };
+ 7DEC0DE81BD7C3A400A32C79 /* MPOAuthAPIRequestLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = D387585214135C3E0013E17C /* MPOAuthAPIRequestLoader.m */; };
+ 7DEC0DE91BD7C3A400A32C79 /* MPOAuthAuthenticationMethod.m in Sources */ = {isa = PBXBuildFile; fileRef = D387585314135C3E0013E17C /* MPOAuthAuthenticationMethod.m */; };
+ 7DEC0DEA1BD7C3A400A32C79 /* MPOAuthAuthenticationMethodOAuth.m in Sources */ = {isa = PBXBuildFile; fileRef = D387585414135C3E0013E17C /* MPOAuthAuthenticationMethodOAuth.m */; };
+ 7DEC0DEB1BD7C3A400A32C79 /* MPOAuthConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = D387585514135C3E0013E17C /* MPOAuthConnection.m */; };
+ 7DEC0DEC1BD7C3A400A32C79 /* MPOAuthCredentiaIConcreteStore+KeychainAdditionsMac.m in Sources */ = {isa = PBXBuildFile; fileRef = D387585614135C3E0013E17C /* MPOAuthCredentiaIConcreteStore+KeychainAdditionsMac.m */; };
+ 7DEC0DED1BD7C3A400A32C79 /* MPOAuthCredentialConcreteStore+KeychainAdditionsiPhone.m in Sources */ = {isa = PBXBuildFile; fileRef = D387585714135C3E0013E17C /* MPOAuthCredentialConcreteStore+KeychainAdditionsiPhone.m */; };
+ 7DEC0DEE1BD7C3A400A32C79 /* MPOAuthCredentialConcreteStore.m in Sources */ = {isa = PBXBuildFile; fileRef = D387585814135C3E0013E17C /* MPOAuthCredentialConcreteStore.m */; };
+ 7DEC0DEF1BD7C3A400A32C79 /* MPOAuthSignatureParameter.m in Sources */ = {isa = PBXBuildFile; fileRef = D387585914135C3E0013E17C /* MPOAuthSignatureParameter.m */; };
+ 7DEC0DF01BD7C3A400A32C79 /* MPOAuthURLRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = D387585A14135C3E0013E17C /* MPOAuthURLRequest.m */; };
+ 7DEC0DF11BD7C3A400A32C79 /* MPOAuthURLResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = D387585B14135C3E0013E17C /* MPOAuthURLResponse.m */; };
+ 7DEC0DF21BD7C3A400A32C79 /* MPURLRequestParameter.m in Sources */ = {isa = PBXBuildFile; fileRef = D387585C14135C3E0013E17C /* MPURLRequestParameter.m */; };
+ 7DEC0DF31BD7C3A400A32C79 /* NSString+URLEscapingAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = D387585D14135C3E0013E17C /* NSString+URLEscapingAdditions.m */; };
+ 7DEC0DF41BD7C3A400A32C79 /* NSURL+MPURLParameterAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = D387585E14135C3E0013E17C /* NSURL+MPURLParameterAdditions.m */; };
+ 7DEC0DF51BD7C3A400A32C79 /* NSURLResponse+Encoding.m in Sources */ = {isa = PBXBuildFile; fileRef = D387585F14135C3E0013E17C /* NSURLResponse+Encoding.m */; };
+ 7DEC0DF61BD7C3B700A32C79 /* NSDictionary+Dropbox.m in Sources */ = {isa = PBXBuildFile; fileRef = D387586014135C3E0013E17C /* NSDictionary+Dropbox.m */; };
+ 7DEC0DF71BD7C3B700A32C79 /* NSString+Dropbox.m in Sources */ = {isa = PBXBuildFile; fileRef = D387586114135C3E0013E17C /* NSString+Dropbox.m */; };
+ 7DEC0DF81BD7C3BE00A32C79 /* DBBase64Transcoder.c in Sources */ = {isa = PBXBuildFile; fileRef = D387585014135C3E0013E17C /* DBBase64Transcoder.c */; };
+ 7DEC0DF91BD7C42B00A32C79 /* DBRestClient+OSX.m in Sources */ = {isa = PBXBuildFile; fileRef = D33A120A1527C21700D3BC28 /* DBRestClient+OSX.m */; };
+ 7DEC0DFA1BD7C4AF00A32C79 /* DBKeychain.h in Headers */ = {isa = PBXBuildFile; fileRef = D33A122B152EB42000D3BC28 /* DBKeychain.h */; };
+ 7DEC0DFC1BD7C4D600A32C79 /* DBBase64Transcoder.h in Headers */ = {isa = PBXBuildFile; fileRef = D387581D14135C3E0013E17C /* DBBase64Transcoder.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0DFD1BD7C4D600A32C79 /* DBAccountInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = D387581E14135C3E0013E17C /* DBAccountInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0DFE1BD7C4D600A32C79 /* DBAuthHelperOSX.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F473CB1520D83A0041AA64 /* DBAuthHelperOSX.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0DFF1BD7C4D600A32C79 /* DBError.h in Headers */ = {isa = PBXBuildFile; fileRef = D387581F14135C3E0013E17C /* DBError.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E001BD7C4D600A32C79 /* DBDeltaEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F4730E151F8FE30041AA64 /* DBDeltaEntry.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E011BD7C4D600A32C79 /* DBLog.h in Headers */ = {isa = PBXBuildFile; fileRef = D387582114135C3E0013E17C /* DBLog.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E021BD7C4D600A32C79 /* DBMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = D387582214135C3E0013E17C /* DBMetadata.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E031BD7C4D600A32C79 /* DBQuota.h in Headers */ = {isa = PBXBuildFile; fileRef = D387582314135C3E0013E17C /* DBQuota.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E041BD7C4D600A32C79 /* DBRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = D387582414135C3E0013E17C /* DBRequest.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E051BD7C4D600A32C79 /* DBRestClient.h in Headers */ = {isa = PBXBuildFile; fileRef = D387582514135C3E0013E17C /* DBRestClient.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E071BD7C4D600A32C79 /* DBSession.h in Headers */ = {isa = PBXBuildFile; fileRef = D387582614135C3E0013E17C /* DBSession.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E081BD7C4D600A32C79 /* DBSession+iOS.h in Headers */ = {isa = PBXBuildFile; fileRef = D3CC8969150834470079CBE8 /* DBSession+iOS.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E091BD7C4D600A32C79 /* DropboxSDK.h in Headers */ = {isa = PBXBuildFile; fileRef = D387582714135C3E0013E17C /* DropboxSDK.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E0B1BD7C4D600A32C79 /* JSON.h in Headers */ = {isa = PBXBuildFile; fileRef = D387582814135C3E0013E17C /* JSON.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E0C1BD7C4D600A32C79 /* MPDebug.h in Headers */ = {isa = PBXBuildFile; fileRef = D387582914135C3E0013E17C /* MPDebug.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E0D1BD7C4D600A32C79 /* MPOAuth.h in Headers */ = {isa = PBXBuildFile; fileRef = D387582A14135C3E0013E17C /* MPOAuth.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E0E1BD7C4D600A32C79 /* MPOAuthAPI.h in Headers */ = {isa = PBXBuildFile; fileRef = D387582B14135C3E0013E17C /* MPOAuthAPI.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E0F1BD7C4D600A32C79 /* MPOAuthAPIRequestLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = D387582C14135C3E0013E17C /* MPOAuthAPIRequestLoader.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E101BD7C4D600A32C79 /* MPOAuthAuthenticationMethod.h in Headers */ = {isa = PBXBuildFile; fileRef = D387582D14135C3E0013E17C /* MPOAuthAuthenticationMethod.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E111BD7C4D600A32C79 /* MPOAuthAuthenticationMethodOAuth.h in Headers */ = {isa = PBXBuildFile; fileRef = D387582E14135C3E0013E17C /* MPOAuthAuthenticationMethodOAuth.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E121BD7C4D600A32C79 /* MPOAuthConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = D387582F14135C3E0013E17C /* MPOAuthConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E131BD7C4D600A32C79 /* MPOAuthCredentialConcreteStore+KeychainAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = D387583014135C3E0013E17C /* MPOAuthCredentialConcreteStore+KeychainAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E141BD7C4D600A32C79 /* MPOAuthCredentialConcreteStore.h in Headers */ = {isa = PBXBuildFile; fileRef = D387583114135C3E0013E17C /* MPOAuthCredentialConcreteStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E151BD7C4D600A32C79 /* MPOAuthCredentialStore.h in Headers */ = {isa = PBXBuildFile; fileRef = D387583214135C3E0013E17C /* MPOAuthCredentialStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E161BD7C4D600A32C79 /* MPOAuthParameterFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = D387583314135C3E0013E17C /* MPOAuthParameterFactory.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E171BD7C4D600A32C79 /* MPOAuthSignatureParameter.h in Headers */ = {isa = PBXBuildFile; fileRef = D387583414135C3E0013E17C /* MPOAuthSignatureParameter.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E181BD7C4D600A32C79 /* MPOAuthURLRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = D387583514135C3E0013E17C /* MPOAuthURLRequest.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E191BD7C4D600A32C79 /* MPOAuthURLResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = D387583614135C3E0013E17C /* MPOAuthURLResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E1A1BD7C4D600A32C79 /* MPURLRequestParameter.h in Headers */ = {isa = PBXBuildFile; fileRef = D387583714135C3E0013E17C /* MPURLRequestParameter.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E1B1BD7C4D600A32C79 /* NSDictionary+Dropbox.h in Headers */ = {isa = PBXBuildFile; fileRef = D387583814135C3E0013E17C /* NSDictionary+Dropbox.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E1C1BD7C4D600A32C79 /* NSObject+DBJSON.h in Headers */ = {isa = PBXBuildFile; fileRef = D387583914135C3E0013E17C /* NSObject+DBJSON.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E1D1BD7C4D600A32C79 /* NSString+Dropbox.h in Headers */ = {isa = PBXBuildFile; fileRef = D387583A14135C3E0013E17C /* NSString+Dropbox.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E1E1BD7C4D600A32C79 /* NSString+DBJSON.h in Headers */ = {isa = PBXBuildFile; fileRef = D387583B14135C3E0013E17C /* NSString+DBJSON.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E1F1BD7C4D700A32C79 /* NSString+URLEscapingAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = D387583C14135C3E0013E17C /* NSString+URLEscapingAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E201BD7C4D700A32C79 /* NSURL+MPURLParameterAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = D387583D14135C3E0013E17C /* NSURL+MPURLParameterAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E211BD7C4D700A32C79 /* NSURLResponse+Encoding.h in Headers */ = {isa = PBXBuildFile; fileRef = D387583E14135C3E0013E17C /* NSURLResponse+Encoding.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E221BD7C4D700A32C79 /* DBJSON.h in Headers */ = {isa = PBXBuildFile; fileRef = D387583F14135C3E0013E17C /* DBJSON.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E231BD7C4D700A32C79 /* DBJsonBase.h in Headers */ = {isa = PBXBuildFile; fileRef = D387584014135C3E0013E17C /* DBJsonBase.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E241BD7C4D700A32C79 /* DBJsonParser.h in Headers */ = {isa = PBXBuildFile; fileRef = D387584114135C3E0013E17C /* DBJsonParser.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E251BD7C4D700A32C79 /* DBJsonWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = D387584214135C3E0013E17C /* DBJsonWriter.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 7DEC0E261BD7C4F900A32C79 /* DBConnectController.h in Headers */ = {isa = PBXBuildFile; fileRef = D3ED1B2F155498F50023FE9F /* DBConnectController.h */; };
B578896218E627FC004EEDF4 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B578896118E627FC004EEDF4 /* Cocoa.framework */; };
B578896418E6282A004EEDF4 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B578896318E6282A004EEDF4 /* Security.framework */; };
D32C1E1B1532707800672F20 /* DBKeychain-OSX.m in Sources */ = {isa = PBXBuildFile; fileRef = D32C1E191532707800672F20 /* DBKeychain-OSX.m */; };
@@ -206,6 +284,9 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
+ 7DEC0DCA1BD7C35D00A32C79 /* DropboxTVSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = DropboxTVSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ 7DEC0DCC1BD7C35D00A32C79 /* DropboxTVSDK.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DropboxTVSDK.h; sourceTree = "<group>"; };
+ 7DEC0DCE1BD7C35D00A32C79 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
AACBBE490F95108600F1A2B1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
B578896118E627FC004EEDF4 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; };
B578896318E6282A004EEDF4 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
@@ -309,6 +390,13 @@
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
+ 7DEC0DC61BD7C35D00A32C79 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
D3196B801412FE180060E7C6 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -342,6 +430,7 @@
D3196B831412FE180060E7C6 /* DropboxSDK.framework */,
D3933BE5145F12AD00E15FA7 /* libSDropboxSDK.a */,
D36931CC15088350003FBA23 /* DropboxOSX.framework */,
+ 7DEC0DCA1BD7C35D00A32C79 /* DropboxTVSDK.framework */,
);
name = Products;
sourceTree = "<group>";
@@ -351,6 +440,7 @@
children = (
D377DBE117F0E0FD005F3E43 /* 64bit.xcconfig */,
D387581114135C3E0013E17C /* Classes */,
+ 7DEC0DCB1BD7C35D00A32C79 /* DropboxTVSDK */,
0867D69AFE84028FC02AAC07 /* Frameworks */,
034768DFFF38A50411DB9C8B /* Products */,
);
@@ -371,6 +461,15 @@
name = Frameworks;
sourceTree = "<group>";
};
+ 7DEC0DCB1BD7C35D00A32C79 /* DropboxTVSDK */ = {
+ isa = PBXGroup;
+ children = (
+ 7DEC0DCC1BD7C35D00A32C79 /* DropboxTVSDK.h */,
+ 7DEC0DCE1BD7C35D00A32C79 /* Info.plist */,
+ );
+ path = DropboxTVSDK;
+ sourceTree = "<group>";
+ };
D36931CF15088350003FBA23 /* Other Frameworks */ = {
isa = PBXGroup;
children = (
@@ -510,6 +609,55 @@
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
+ 7DEC0DC71BD7C35D00A32C79 /* Headers */ = {
+ isa = PBXHeadersBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 7DEC0DFC1BD7C4D600A32C79 /* DBBase64Transcoder.h in Headers */,
+ 7DEC0DFD1BD7C4D600A32C79 /* DBAccountInfo.h in Headers */,
+ 7DEC0DFE1BD7C4D600A32C79 /* DBAuthHelperOSX.h in Headers */,
+ 7DEC0DFF1BD7C4D600A32C79 /* DBError.h in Headers */,
+ 7DEC0E001BD7C4D600A32C79 /* DBDeltaEntry.h in Headers */,
+ 7DEC0E011BD7C4D600A32C79 /* DBLog.h in Headers */,
+ 7DEC0E021BD7C4D600A32C79 /* DBMetadata.h in Headers */,
+ 7DEC0E031BD7C4D600A32C79 /* DBQuota.h in Headers */,
+ 7DEC0E041BD7C4D600A32C79 /* DBRequest.h in Headers */,
+ 7DEC0E051BD7C4D600A32C79 /* DBRestClient.h in Headers */,
+ 7DEC0E071BD7C4D600A32C79 /* DBSession.h in Headers */,
+ 7DEC0E081BD7C4D600A32C79 /* DBSession+iOS.h in Headers */,
+ 7DEC0E091BD7C4D600A32C79 /* DropboxSDK.h in Headers */,
+ 7DEC0E0B1BD7C4D600A32C79 /* JSON.h in Headers */,
+ 7DEC0E0C1BD7C4D600A32C79 /* MPDebug.h in Headers */,
+ 7DEC0E0D1BD7C4D600A32C79 /* MPOAuth.h in Headers */,
+ 7DEC0E0E1BD7C4D600A32C79 /* MPOAuthAPI.h in Headers */,
+ 7DEC0E0F1BD7C4D600A32C79 /* MPOAuthAPIRequestLoader.h in Headers */,
+ 7DEC0E101BD7C4D600A32C79 /* MPOAuthAuthenticationMethod.h in Headers */,
+ 7DEC0E111BD7C4D600A32C79 /* MPOAuthAuthenticationMethodOAuth.h in Headers */,
+ 7DEC0E121BD7C4D600A32C79 /* MPOAuthConnection.h in Headers */,
+ 7DEC0E131BD7C4D600A32C79 /* MPOAuthCredentialConcreteStore+KeychainAdditions.h in Headers */,
+ 7DEC0E141BD7C4D600A32C79 /* MPOAuthCredentialConcreteStore.h in Headers */,
+ 7DEC0E151BD7C4D600A32C79 /* MPOAuthCredentialStore.h in Headers */,
+ 7DEC0E161BD7C4D600A32C79 /* MPOAuthParameterFactory.h in Headers */,
+ 7DEC0E171BD7C4D600A32C79 /* MPOAuthSignatureParameter.h in Headers */,
+ 7DEC0E181BD7C4D600A32C79 /* MPOAuthURLRequest.h in Headers */,
+ 7DEC0E191BD7C4D600A32C79 /* MPOAuthURLResponse.h in Headers */,
+ 7DEC0E1A1BD7C4D600A32C79 /* MPURLRequestParameter.h in Headers */,
+ 7DEC0E1B1BD7C4D600A32C79 /* NSDictionary+Dropbox.h in Headers */,
+ 7DEC0E1C1BD7C4D600A32C79 /* NSObject+DBJSON.h in Headers */,
+ 7DEC0E1D1BD7C4D600A32C79 /* NSString+Dropbox.h in Headers */,
+ 7DEC0E1E1BD7C4D600A32C79 /* NSString+DBJSON.h in Headers */,
+ 7DEC0E1F1BD7C4D700A32C79 /* NSString+URLEscapingAdditions.h in Headers */,
+ 7DEC0E201BD7C4D700A32C79 /* NSURL+MPURLParameterAdditions.h in Headers */,
+ 7DEC0E211BD7C4D700A32C79 /* NSURLResponse+Encoding.h in Headers */,
+ 7DEC0E221BD7C4D700A32C79 /* DBJSON.h in Headers */,
+ 7DEC0E231BD7C4D700A32C79 /* DBJsonBase.h in Headers */,
+ 7DEC0E241BD7C4D700A32C79 /* DBJsonParser.h in Headers */,
+ 7DEC0E251BD7C4D700A32C79 /* DBJsonWriter.h in Headers */,
+ 7DEC0E261BD7C4F900A32C79 /* DBConnectController.h in Headers */,
+ 7DEC0DFA1BD7C4AF00A32C79 /* DBKeychain.h in Headers */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
D35BECA61413075500479FCC /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
@@ -618,6 +766,24 @@
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
+ 7DEC0DC91BD7C35D00A32C79 /* DropboxTVSDK */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 7DEC0DD11BD7C35D00A32C79 /* Build configuration list for PBXNativeTarget "DropboxTVSDK" */;
+ buildPhases = (
+ 7DEC0DC51BD7C35D00A32C79 /* Sources */,
+ 7DEC0DC61BD7C35D00A32C79 /* Frameworks */,
+ 7DEC0DC71BD7C35D00A32C79 /* Headers */,
+ 7DEC0DC81BD7C35D00A32C79 /* Resources */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = DropboxTVSDK;
+ productName = DropboxTVSDK;
+ productReference = 7DEC0DCA1BD7C35D00A32C79 /* DropboxTVSDK.framework */;
+ productType = "com.apple.product-type.framework";
+ };
D3196B821412FE180060E7C6 /* DropboxSDK */ = {
isa = PBXNativeTarget;
buildConfigurationList = D3196B8D1412FE190060E7C6 /* Build configuration list for PBXNativeTarget "DropboxSDK" */;
@@ -678,6 +844,11 @@
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0510;
+ TargetAttributes = {
+ 7DEC0DC91BD7C35D00A32C79 = {
+ CreatedOnToolsVersion = 7.1;
+ };
+ };
};
buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "DropboxSDK" */;
compatibilityVersion = "Xcode 3.2";
@@ -698,11 +869,19 @@
D3196B821412FE180060E7C6 /* DropboxSDK */,
D3933BE4145F12AD00E15FA7 /* SDropboxSDK */,
D36931CB15088350003FBA23 /* DropboxOSX */,
+ 7DEC0DC91BD7C35D00A32C79 /* DropboxTVSDK */,
);
};
/* End PBXProject section */
/* Begin PBXResourcesBuildPhase section */
+ 7DEC0DC81BD7C35D00A32C79 /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
D3196B811412FE180060E7C6 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
@@ -720,6 +899,49 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
+ 7DEC0DC51BD7C35D00A32C79 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 7DEC0DD21BD7C38200A32C79 /* DBAccountInfo.m in Sources */,
+ 7DEC0DD61BD7C38200A32C79 /* DBError.m in Sources */,
+ 7DEC0DD91BD7C38200A32C79 /* DBLog.m in Sources */,
+ 7DEC0DDA1BD7C38200A32C79 /* DBMetadata.m in Sources */,
+ 7DEC0DDB1BD7C38200A32C79 /* DBQuota.m in Sources */,
+ 7DEC0DDC1BD7C38200A32C79 /* DBRequest.m in Sources */,
+ 7DEC0DDD1BD7C38200A32C79 /* DBRestClient.m in Sources */,
+ 7DEC0DDF1BD7C38200A32C79 /* DBSession.m in Sources */,
+ 7DEC0DE11BD7C39800A32C79 /* NSObject+DBJSON.m in Sources */,
+ 7DEC0DE21BD7C39800A32C79 /* NSString+DBJSON.m in Sources */,
+ 7DEC0DE31BD7C39800A32C79 /* DBJSON.m in Sources */,
+ 7DEC0DE41BD7C39800A32C79 /* DBJsonBase.m in Sources */,
+ 7DEC0DE51BD7C39800A32C79 /* DBJsonParser.m in Sources */,
+ 7DEC0DE61BD7C39800A32C79 /* DBJsonWriter.m in Sources */,
+ 7DEC0DF81BD7C3BE00A32C79 /* DBBase64Transcoder.c in Sources */,
+ 7DEC0DE71BD7C3A400A32C79 /* MPOAuthAPI.m in Sources */,
+ 7DEC0DE81BD7C3A400A32C79 /* MPOAuthAPIRequestLoader.m in Sources */,
+ 7DEC0DE91BD7C3A400A32C79 /* MPOAuthAuthenticationMethod.m in Sources */,
+ 7DEC0DEA1BD7C3A400A32C79 /* MPOAuthAuthenticationMethodOAuth.m in Sources */,
+ 7DEC0DEB1BD7C3A400A32C79 /* MPOAuthConnection.m in Sources */,
+ 7DEC0DEC1BD7C3A400A32C79 /* MPOAuthCredentiaIConcreteStore+KeychainAdditionsMac.m in Sources */,
+ 7DEC0DED1BD7C3A400A32C79 /* MPOAuthCredentialConcreteStore+KeychainAdditionsiPhone.m in Sources */,
+ 7DEC0DEE1BD7C3A400A32C79 /* MPOAuthCredentialConcreteStore.m in Sources */,
+ 7DEC0DEF1BD7C3A400A32C79 /* MPOAuthSignatureParameter.m in Sources */,
+ 7DEC0DF01BD7C3A400A32C79 /* MPOAuthURLRequest.m in Sources */,
+ 7DEC0DF11BD7C3A400A32C79 /* MPOAuthURLResponse.m in Sources */,
+ 7DEC0DF21BD7C3A400A32C79 /* MPURLRequestParameter.m in Sources */,
+ 7DEC0DF31BD7C3A400A32C79 /* NSString+URLEscapingAdditions.m in Sources */,
+ 7DEC0DF41BD7C3A400A32C79 /* NSURL+MPURLParameterAdditions.m in Sources */,
+ 7DEC0DF51BD7C3A400A32C79 /* NSURLResponse+Encoding.m in Sources */,
+ 7DEC0DF61BD7C3B700A32C79 /* NSDictionary+Dropbox.m in Sources */,
+ 7DEC0DF71BD7C3B700A32C79 /* NSString+Dropbox.m in Sources */,
+ 7DEC0DD51BD7C38200A32C79 /* DBDeltaEntry.m in Sources */,
+ 7DEC0DF91BD7C42B00A32C79 /* DBRestClient+OSX.m in Sources */,
+ 7DEC0DE01BD7C38200A32C79 /* DBSession+iOS.m in Sources */,
+ 7DEC0DD71BD7C38200A32C79 /* DBKeychain-iOS.m in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
D3196B7F1412FE180060E7C6 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -881,6 +1103,112 @@
};
name = Release;
};
+ 7DEC0DCF1BD7C35D00A32C79 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+ CLANG_CXX_LIBRARY = "libc++";
+ CLANG_ENABLE_MODULES = YES;
+ CLANG_ENABLE_OBJC_ARC = NO;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_UNREACHABLE_CODE = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ COPY_PHASE_STRIP = NO;
+ CURRENT_PROJECT_VERSION = 1;
+ DEBUG_INFORMATION_FORMAT = dwarf;
+ DEFINES_MODULE = YES;
+ DYLIB_COMPATIBILITY_VERSION = 1;
+ DYLIB_CURRENT_VERSION = 1;
+ DYLIB_INSTALL_NAME_BASE = "@rpath";
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
+ ENABLE_TESTABILITY = YES;
+ GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_NO_COMMON_BLOCKS = YES;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = "Classes/DropboxSDK-Prefix.pch";
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "DEBUG=1",
+ "$(inherited)",
+ );
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+ GCC_WARN_UNUSED_FUNCTION = YES;
+ INFOPLIST_FILE = "Classes/DropboxSDK-Info.plist";
+ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+ MTL_ENABLE_DEBUG_INFO = YES;
+ PRODUCT_BUNDLE_IDENTIFIER = org.videolan.DropboxTVSDK;
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ SDKROOT = appletvos;
+ SKIP_INSTALL = YES;
+ TARGETED_DEVICE_FAMILY = 3;
+ TVOS_DEPLOYMENT_TARGET = 9.0;
+ VERSIONING_SYSTEM = "apple-generic";
+ VERSION_INFO_PREFIX = "";
+ };
+ name = Debug;
+ };
+ 7DEC0DD01BD7C35D00A32C79 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+ CLANG_CXX_LIBRARY = "libc++";
+ CLANG_ENABLE_MODULES = YES;
+ CLANG_ENABLE_OBJC_ARC = NO;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_UNREACHABLE_CODE = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ COPY_PHASE_STRIP = NO;
+ CURRENT_PROJECT_VERSION = 1;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DEFINES_MODULE = YES;
+ DYLIB_COMPATIBILITY_VERSION = 1;
+ DYLIB_CURRENT_VERSION = 1;
+ DYLIB_INSTALL_NAME_BASE = "@rpath";
+ ENABLE_NS_ASSERTIONS = NO;
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
+ GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_NO_COMMON_BLOCKS = YES;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = "Classes/DropboxSDK-Prefix.pch";
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+ GCC_WARN_UNUSED_FUNCTION = YES;
+ INFOPLIST_FILE = "Classes/DropboxSDK-Info.plist";
+ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+ MTL_ENABLE_DEBUG_INFO = NO;
+ PRODUCT_BUNDLE_IDENTIFIER = org.videolan.DropboxTVSDK;
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ SDKROOT = appletvos;
+ SKIP_INSTALL = YES;
+ TARGETED_DEVICE_FAMILY = 3;
+ TVOS_DEPLOYMENT_TARGET = 9.0;
+ VALIDATE_PRODUCT = YES;
+ VERSIONING_SYSTEM = "apple-generic";
+ VERSION_INFO_PREFIX = "";
+ };
+ name = Release;
+ };
D3196B8E1412FE190060E7C6 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -1015,6 +1343,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = (
+ "$(ARCHS_STANDARD)",
+ armv7s,
+ );
COPY_PHASE_STRIP = NO;
DSTROOT = /tmp/SDropboxSDK.dst;
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1040,6 +1372,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = (
+ "$(ARCHS_STANDARD)",
+ armv7s,
+ );
COPY_PHASE_STRIP = YES;
DSTROOT = /tmp/SDropboxSDK.dst;
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1068,6 +1404,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
+ 7DEC0DD11BD7C35D00A32C79 /* Build configuration list for PBXNativeTarget "DropboxTVSDK" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 7DEC0DCF1BD7C35D00A32C79 /* Debug */,
+ 7DEC0DD01BD7C35D00A32C79 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
D3196B8D1412FE190060E7C6 /* Build configuration list for PBXNativeTarget "DropboxSDK" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Index: GTL.xcodeproj/project.pbxproj
===================================================================
--- GTL.xcodeproj/project.pbxproj (revision 457)
+++ GTL.xcodeproj/project.pbxproj (working copy)
@@ -1048,7 +1048,6 @@
SDKROOT = macosx;
WARNING_CFLAGS = (
"-Wall",
- "-Werror",
"-Wendif-labels",
"-Wnewline-eof",
"-Wfloat-equal",
@@ -1084,7 +1083,6 @@
SDKROOT = macosx;
WARNING_CFLAGS = (
"-Wall",
- "-Werror",
"-Wendif-labels",
"-Wnewline-eof",
"-Wfloat-equal",
@@ -1178,26 +1176,36 @@
4F1C6E101027B3CF00B46459 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD)";
+ ARCHS = (
+ "$(ARCHS_STANDARD)",
+ armv7s,
+ );
+ IPHONEOS_DEPLOYMENT_TARGET = 7.0;
OTHER_CFLAGS = (
"$(inherited)",
"-DGTL_IPHONE=1",
);
PRODUCT_NAME = GTLTouchStaticLib;
SDKROOT = iphoneos;
+ SKIP_INSTALL = YES;
};
name = Debug;
};
4F1C6E111027B3CF00B46459 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD)";
+ ARCHS = (
+ "$(ARCHS_STANDARD)",
+ armv7s,
+ );
+ IPHONEOS_DEPLOYMENT_TARGET = 7.0;
OTHER_CFLAGS = (
"$(inherited)",
"-DGTL_IPHONE=1",
);
PRODUCT_NAME = GTLTouchStaticLib;
SDKROOT = iphoneos;
+ SKIP_INSTALL = YES;
};
name = Release;
};
Index: Objects/GTLService.h
===================================================================
--- Objects/GTLService.h (revision 457)
+++ Objects/GTLService.h (working copy)
@@ -30,13 +30,6 @@
// GTMSessionFetcher rather than the older GTMHTTPFetcher. The session
// fetcher requires iOS 7/OS X 10.9 and supports out-of-process uploads.
-#if (!TARGET_OS_IPHONE && defined(MAC_OS_X_VERSION_10_11) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_11) \
- || (TARGET_OS_IPHONE && defined(__IPHONE_9_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0)
- #ifndef GTM_USE_SESSION_FETCHER
- #define GTM_USE_SESSION_FETCHER 1
- #endif
-#endif
-
#if !defined(GTL_USE_SESSION_FETCHER) && defined(GTM_USE_SESSION_FETCHER)
#define GTL_USE_SESSION_FETCHER GTM_USE_SESSION_FETCHER
#endif // GTL_USE_SESSION_FETCHER
Index: GTMOAuth2Authentication.h
===================================================================
--- GTMOAuth2Authentication.h (revision 131)
+++ GTMOAuth2Authentication.h (working copy)
@@ -23,7 +23,7 @@
#if (!TARGET_OS_IPHONE && defined(MAC_OS_X_VERSION_10_11) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_11) \
|| (TARGET_OS_IPHONE && defined(__IPHONE_9_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0)
#ifndef GTM_USE_SESSION_FETCHER
- #define GTM_USE_SESSION_FETCHER 1
+ #define GTM_USE_SESSION_FETCHER 0
#endif
#endif
Index: GTMGatherInputStream.m
===================================================================
--- GTMGatherInputStream.m (revision 143)
+++ GTMGatherInputStream.m (working copy)
@@ -18,7 +18,7 @@
@implementation GTMGatherInputStream
+ (NSInputStream *)streamWithArray:(NSArray *)dataArray {
- return [[[self alloc] initWithArray:dataArray] autorelease];
+ return [[[GTMGatherInputStream alloc] initWithArray:dataArray] autorelease];
}
- (id)initWithArray:(NSArray *)dataArray {
diff -ru HockeySDK-tvOS/Support/HockeySDK.xcodeproj/project.pbxproj HockeySDK-tvOS/Support/HockeySDK.xcodeproj/project.pbxproj
--- /Users/fkuehne/Desktop/HockeySDK-tvOS/Support/HockeySDK.xcodeproj/project.pbxproj 2015-10-30 12:45:50.000000000 +0100
+++ HockeySDK-tvOS/Support/HockeySDK.xcodeproj/project.pbxproj 2015-11-27 12:34:18.000000000 +0100
@@ -158,13 +158,11 @@
1EB617B71B0A31D30035A986 /* BITCrashReportTextFormatterTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E566D061A275C4C0070F514 /* BITCrashReportTextFormatterTests.m */; };
1EB617B81B0A31DB0035A986 /* BITTestHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 1EA1170616F53B91001C015C /* BITTestHelper.m */; };
1EB617B91B0A32780035A986 /* HockeySDKResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 1E59550A15B6F45800A03429 /* HockeySDKResources.bundle */; };
- 1EB617BA1B0A32870035A986 /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9760F6C318BB4D2D00959B93 /* AssetsLibrary.framework */; };
1EB617BC1B0A32C90035A986 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EB617BB1B0A32C90035A986 /* CoreText.framework */; };
1EB617BE1B0A32D00035A986 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EB617BD1B0A32D00035A986 /* CoreGraphics.framework */; };
1EB617BF1B0A32DC0035A986 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E400561D148D79B500EB22B9 /* Foundation.framework */; };
1EB617C01B0A32E40035A986 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97CC11F81917C0310028768F /* MobileCoreServices.framework */; };
1EB617C21B0A32EE0035A986 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EB617C11B0A32EE0035A986 /* QuartzCore.framework */; };
- 1EB617C31B0A32F70035A986 /* QuickLook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97BD9BD4191109730043FD59 /* QuickLook.framework */; };
1EB617C51B0A33020035A986 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EB617C41B0A33020035A986 /* Security.framework */; };
1EB617C71B0A330C0035A986 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EB617C61B0A330C0035A986 /* SystemConfiguration.framework */; };
1EB617C91B0A33140035A986 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EB617C81B0A33140035A986 /* UIKit.framework */; };
@@ -395,14 +393,12 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 1EB617BA1B0A32870035A986 /* AssetsLibrary.framework in Frameworks */,
1EB617BC1B0A32C90035A986 /* CoreText.framework in Frameworks */,
1EB617BE1B0A32D00035A986 /* CoreGraphics.framework in Frameworks */,
1EB617BF1B0A32DC0035A986 /* Foundation.framework in Frameworks */,
1EB617C01B0A32E40035A986 /* MobileCoreServices.framework in Frameworks */,
1EB617C21B0A32EE0035A986 /* QuartzCore.framework in Frameworks */,
1EB617CB1B0A34040035A986 /* CrashReporter.framework in Frameworks */,
- 1EB617C31B0A32F70035A986 /* QuickLook.framework in Frameworks */,
1EB617C51B0A33020035A986 /* Security.framework in Frameworks */,
1EB617C71B0A330C0035A986 /* SystemConfiguration.framework in Frameworks */,
1EB617C91B0A33140035A986 /* UIKit.framework in Frameworks */,
From 8553c1f37f30b366cfd77a4ead19d2e7d0ae356f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 8 Jan 2015 00:44:58 +0100
Subject: [PATCH 1/4] Compile ARMv7s slice
---
src/LiveSDK.xcodeproj/project.pbxproj | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/LiveSDK.xcodeproj/project.pbxproj b/src/LiveSDK.xcodeproj/project.pbxproj
index 24c1677..fd45f68 100755
--- a/src/LiveSDK.xcodeproj/project.pbxproj
+++ b/src/LiveSDK.xcodeproj/project.pbxproj
@@ -656,7 +656,7 @@
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
- VALID_ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
+ VALID_ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT) armv7s";
WRAPPER_EXTENSION = framework;
};
name = Debug;
@@ -679,7 +679,7 @@
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
- VALID_ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
+ VALID_ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT) armv7s";
WRAPPER_EXTENSION = framework;
};
name = Release;
--
2.6.1
From 208b4aec537919cbc8252d635993b1c7d407d32c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Tue, 28 Jul 2015 10:32:55 +0200
Subject: [PATCH 2/4] Add our own static library target
---
src/LiveSDK.xcodeproj/project.pbxproj | 162 ++++++++++++++++++++++++++++++++++
1 file changed, 162 insertions(+)
diff --git a/src/LiveSDK.xcodeproj/project.pbxproj b/src/LiveSDK.xcodeproj/project.pbxproj
index fd45f68..c4772ce 100755
--- a/src/LiveSDK.xcodeproj/project.pbxproj
+++ b/src/LiveSDK.xcodeproj/project.pbxproj
@@ -97,8 +97,41 @@
52C47514149B38D1007E646F /* LiveOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 529DB6D7146C7550000973C1 /* LiveOperation.m */; };
52C47515149B38D1007E646F /* LiveOperationProgress.m in Sources */ = {isa = PBXBuildFile; fileRef = 52B4944C1487625C001EA573 /* LiveOperationProgress.m */; };
52C47518149B390F007E646F /* LiveAuthDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = 5210CF951494445E00C525F3 /* LiveAuthDialog.m */; };
+ 7D2AC5B71B67723A00A8D9DD /* LiveOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 529DB6D7146C7550000973C1 /* LiveOperation.m */; };
+ 7D2AC5B81B67723E00A8D9DD /* LiveDownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 529DB6D4146C7550000973C1 /* LiveDownloadOperation.m */; };
+ 7D2AC5B91B67724200A8D9DD /* LiveConnectSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 529DB6D2146C7550000973C1 /* LiveConnectSession.m */; };
+ 7D2AC5BA1B67724600A8D9DD /* LiveConnectClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 529DB6D0146C7550000973C1 /* LiveConnectClient.m */; };
+ 7D2AC5BB1B67724C00A8D9DD /* UrlHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 529DB6E4146C761C000973C1 /* UrlHelper.m */; };
+ 7D2AC5BC1B67724F00A8D9DD /* StringHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 529DB6E2146C761C000973C1 /* StringHelper.m */; };
+ 7D2AC5BD1B67725300A8D9DD /* LiveAuthHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 529DB6FC146E36CA000973C1 /* LiveAuthHelper.m */; };
+ 7D2AC5BE1B67725800A8D9DD /* JsonWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5285175D1471FFFF009E8BD6 /* JsonWriter.m */; };
+ 7D2AC5BF1B67725C00A8D9DD /* JsonParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 5285175B1471FFFE009E8BD6 /* JsonParser.m */; };
+ 7D2AC5C01B67727300A8D9DD /* LiveOperationCore.m in Sources */ = {isa = PBXBuildFile; fileRef = 529DB6EC146C7A39000973C1 /* LiveOperationCore.m */; };
+ 7D2AC5C11B67727700A8D9DD /* LiveConnectClientCore.m in Sources */ = {isa = PBXBuildFile; fileRef = 529DB6EF146C7AEE000973C1 /* LiveConnectClientCore.m */; };
+ 7D2AC5C21B67727B00A8D9DD /* LiveAuthRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 529DB712146F5809000973C1 /* LiveAuthRequest.m */; };
+ 7D2AC5C31B67728300A8D9DD /* LiveOperationProgress.m in Sources */ = {isa = PBXBuildFile; fileRef = 52B4944C1487625C001EA573 /* LiveOperationProgress.m */; };
+ 7D2AC5C41B67728A00A8D9DD /* StreamReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 52AB74BB148D5548004FC55A /* StreamReader.m */; };
+ 7D2AC5C51B67729900A8D9DD /* LiveDownloadOperationCore.m in Sources */ = {isa = PBXBuildFile; fileRef = 52B494521488BDF5001EA573 /* LiveDownloadOperationCore.m */; };
+ 7D2AC5C61B67729D00A8D9DD /* LiveUploadOperationCore.m in Sources */ = {isa = PBXBuildFile; fileRef = 52B4946E148B7D67001EA573 /* LiveUploadOperationCore.m */; };
+ 7D2AC5C71B6772A100A8D9DD /* LiveAuthStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 52B54AE514909F16001E1E17 /* LiveAuthStorage.m */; };
+ 7D2AC5C81B6772A500A8D9DD /* LiveAuthRefreshRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 52B54AEE14912DB8001E1E17 /* LiveAuthRefreshRequest.m */; };
+ 7D2AC5C91B6772B700A8D9DD /* LiveApiHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 52F76E90147A308500DA0A46 /* LiveApiHelper.m */; };
+ 7D2AC5CA1B6772BF00A8D9DD /* LiveAuthDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = 5210CF951494445E00C525F3 /* LiveAuthDialog.m */; };
+ 7D2AC5CB1B6772CC00A8D9DD /* LiveConnectionHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 52C47500149B24F1007E646F /* LiveConnectionHelper.m */; };
/* End PBXBuildFile section */
+/* Begin PBXCopyFilesBuildPhase section */
+ 7D2AC5AC1B6771D000A8D9DD /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "include/$(PRODUCT_NAME)";
+ dstSubfolderSpec = 16;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXCopyFilesBuildPhase section */
+
/* Begin PBXFileReference section */
5210CF941494445B00C525F3 /* LiveAuthDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LiveAuthDialog.h; path = Library/Internal/LiveAuthDialog.h; sourceTree = "<group>"; };
5210CF951494445E00C525F3 /* LiveAuthDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LiveAuthDialog.m; path = Library/Internal/LiveAuthDialog.m; sourceTree = "<group>"; };
@@ -189,6 +222,7 @@
52F76E8F147A308500DA0A46 /* LiveApiHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LiveApiHelper.h; path = LiveSDK/Library/Internal/Helpers/LiveApiHelper.h; sourceTree = SOURCE_ROOT; };
52F76E90147A308500DA0A46 /* LiveApiHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LiveApiHelper.m; path = LiveSDK/Library/Internal/Helpers/LiveApiHelper.m; sourceTree = SOURCE_ROOT; };
52F76E94147A3FA500DA0A46 /* LiveAuthDialog_iPad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = LiveAuthDialog_iPad.xib; path = Library/Internal/LiveAuthDialog_iPad.xib; sourceTree = "<group>"; };
+ 7D2AC5AE1B6771D000A8D9DD /* libLiveSDK-static.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libLiveSDK-static.a"; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -209,6 +243,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 7D2AC5AB1B6771D000A8D9DD /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;