123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504 |
- 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 = (
|