Skip to content

Commit 9016b51

Browse files
author
Stephen Cobbe
committed
Updated Xcode project to import two platforms at once correctly.
1 parent 488156e commit 9016b51

File tree

6 files changed

+29
-40
lines changed

6 files changed

+29
-40
lines changed

‎Format/generate_docs.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ else
99

1010
echo "Checking doc repo exists..."
1111

12-
if [ -d base_location ]; then
12+
if [ -d "../../docs_obj_c/api-docs" ]; then
1313
docs_location="$base_location/$sdk_version"
1414
tmp_location="$base_location/all_sdk_files"
1515
if [ -d $docs_location ]; then

‎Source/ObjectiveDropboxOfficial/ObjectiveDropboxOfficial.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
F25D1B481D95B68600B748CF /* ObjectiveDropboxOfficial.h in Headers */ = {isa = PBXBuildFile; fileRef = F25D1B471D95B68600B748CF /* ObjectiveDropboxOfficial.h */; };
11+
F25D1B491D95B68600B748CF /* ObjectiveDropboxOfficial.h in Headers */ = {isa = PBXBuildFile; fileRef = F25D1B471D95B68600B748CF /* ObjectiveDropboxOfficial.h */; };
1012
F27DEB9A1D7FFBB9003B1CEE /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F27DEB991D7FFBB9003B1CEE /* AppKit.framework */; };
1113
F27DEB9C1D7FFBBF003B1CEE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F27DEB9B1D7FFBBF003B1CEE /* Foundation.framework */; };
1214
F29AFA7B1D7FF0220043800A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F29AFA7A1D7FF0220043800A /* Foundation.framework */; };
@@ -16,14 +18,12 @@
1618
F2EBB7551D921E63004707E1 /* DBOAuthMobile.m in Sources */ = {isa = PBXBuildFile; fileRef = F2EBB74E1D921E63004707E1 /* DBOAuthMobile.m */; };
1719
F2EBB7561D921E63004707E1 /* DropboxClientsManager+MobileAuth.h in Headers */ = {isa = PBXBuildFile; fileRef = F2EBB74F1D921E63004707E1 /* DropboxClientsManager+MobileAuth.h */; settings = {ATTRIBUTES = (Public, ); }; };
1820
F2EBB7571D921E63004707E1 /* DropboxClientsManager+MobileAuth.m in Sources */ = {isa = PBXBuildFile; fileRef = F2EBB7501D921E63004707E1 /* DropboxClientsManager+MobileAuth.m */; };
19-
F2EBB7581D921E63004707E1 /* DropboxSDKImports.h in Headers */ = {isa = PBXBuildFile; fileRef = F2EBB7511D921E63004707E1 /* DropboxSDKImports.h */; settings = {ATTRIBUTES = (Public, ); }; };
20-
F2EBB7591D921E63004707E1 /* ObjectiveDropboxOfficial.h in Headers */ = {isa = PBXBuildFile; fileRef = F2EBB7521D921E63004707E1 /* ObjectiveDropboxOfficial.h */; settings = {ATTRIBUTES = (Public, ); }; };
21+
F2EBB7581D921E63004707E1 /* DropboxSDKImportsMobile.h in Headers */ = {isa = PBXBuildFile; fileRef = F2EBB7511D921E63004707E1 /* DropboxSDKImportsMobile.h */; settings = {ATTRIBUTES = (Public, ); }; };
2122
F2EBB7641D921E6C004707E1 /* DBOAuthDesktop.h in Headers */ = {isa = PBXBuildFile; fileRef = F2EBB75D1D921E6C004707E1 /* DBOAuthDesktop.h */; settings = {ATTRIBUTES = (Public, ); }; };
2223
F2EBB7651D921E6C004707E1 /* DBOAuthDesktop.m in Sources */ = {isa = PBXBuildFile; fileRef = F2EBB75E1D921E6C004707E1 /* DBOAuthDesktop.m */; };
2324
F2EBB7661D921E6C004707E1 /* DropboxClientsManager+DesktopAuth.h in Headers */ = {isa = PBXBuildFile; fileRef = F2EBB75F1D921E6C004707E1 /* DropboxClientsManager+DesktopAuth.h */; settings = {ATTRIBUTES = (Public, ); }; };
2425
F2EBB7671D921E6C004707E1 /* DropboxClientsManager+DesktopAuth.m in Sources */ = {isa = PBXBuildFile; fileRef = F2EBB7601D921E6C004707E1 /* DropboxClientsManager+DesktopAuth.m */; };
25-
F2EBB7681D921E6C004707E1 /* DropboxSDKImports.h in Headers */ = {isa = PBXBuildFile; fileRef = F2EBB7611D921E6C004707E1 /* DropboxSDKImports.h */; settings = {ATTRIBUTES = (Public, ); }; };
26-
F2EBB7691D921E6C004707E1 /* ObjectiveDropboxOfficial.h in Headers */ = {isa = PBXBuildFile; fileRef = F2EBB7621D921E6C004707E1 /* ObjectiveDropboxOfficial.h */; settings = {ATTRIBUTES = (Public, ); }; };
26+
F2EBB7681D921E6C004707E1 /* DropboxSDKImportsDesktop.h in Headers */ = {isa = PBXBuildFile; fileRef = F2EBB7611D921E6C004707E1 /* DropboxSDKImportsDesktop.h */; settings = {ATTRIBUTES = (Public, ); }; };
2727
F2EBBAD41D921E79004707E1 /* DBASYNCLaunchEmptyResult.h in Headers */ = {isa = PBXBuildFile; fileRef = F2EBB76D1D921E78004707E1 /* DBASYNCLaunchEmptyResult.h */; settings = {ATTRIBUTES = (Public, ); }; };
2828
F2EBBAD51D921E79004707E1 /* DBASYNCLaunchEmptyResult.h in Headers */ = {isa = PBXBuildFile; fileRef = F2EBB76D1D921E78004707E1 /* DBASYNCLaunchEmptyResult.h */; settings = {ATTRIBUTES = (Public, ); }; };
2929
F2EBBAD61D921E79004707E1 /* DBASYNCLaunchEmptyResult.m in Sources */ = {isa = PBXBuildFile; fileRef = F2EBB76E1D921E78004707E1 /* DBASYNCLaunchEmptyResult.m */; };
@@ -1741,6 +1741,7 @@
17411741
/* End PBXBuildFile section */
17421742

17431743
/* Begin PBXFileReference section */
1744+
F25D1B471D95B68600B748CF /* ObjectiveDropboxOfficial.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectiveDropboxOfficial.h; sourceTree = "<group>"; };
17441745
F26B75751D7F6AF700714F70 /* ObjectiveDropboxOfficial.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ObjectiveDropboxOfficial.framework; sourceTree = BUILT_PRODUCTS_DIR; };
17451746
F27DE9E21D7FF909003B1CEE /* ObjectiveDropboxOfficial.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ObjectiveDropboxOfficial.framework; sourceTree = BUILT_PRODUCTS_DIR; };
17461747
F27DEB991D7FFBB9003B1CEE /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/AppKit.framework; sourceTree = DEVELOPER_DIR; };
@@ -1753,15 +1754,13 @@
17531754
F2EBB74E1D921E63004707E1 /* DBOAuthMobile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBOAuthMobile.m; sourceTree = "<group>"; };
17541755
F2EBB74F1D921E63004707E1 /* DropboxClientsManager+MobileAuth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DropboxClientsManager+MobileAuth.h"; sourceTree = "<group>"; };
17551756
F2EBB7501D921E63004707E1 /* DropboxClientsManager+MobileAuth.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "DropboxClientsManager+MobileAuth.m"; sourceTree = "<group>"; };
1756-
F2EBB7511D921E63004707E1 /* DropboxSDKImports.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DropboxSDKImports.h; sourceTree = "<group>"; };
1757-
F2EBB7521D921E63004707E1 /* ObjectiveDropboxOfficial.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectiveDropboxOfficial.h; sourceTree = "<group>"; };
1757+
F2EBB7511D921E63004707E1 /* DropboxSDKImportsMobile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DropboxSDKImportsMobile.h; sourceTree = "<group>"; };
17581758
F2EBB75B1D921E6C004707E1 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
17591759
F2EBB75D1D921E6C004707E1 /* DBOAuthDesktop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBOAuthDesktop.h; sourceTree = "<group>"; };
17601760
F2EBB75E1D921E6C004707E1 /* DBOAuthDesktop.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBOAuthDesktop.m; sourceTree = "<group>"; };
17611761
F2EBB75F1D921E6C004707E1 /* DropboxClientsManager+DesktopAuth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DropboxClientsManager+DesktopAuth.h"; sourceTree = "<group>"; };
17621762
F2EBB7601D921E6C004707E1 /* DropboxClientsManager+DesktopAuth.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "DropboxClientsManager+DesktopAuth.m"; sourceTree = "<group>"; };
1763-
F2EBB7611D921E6C004707E1 /* DropboxSDKImports.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DropboxSDKImports.h; sourceTree = "<group>"; };
1764-
F2EBB7621D921E6C004707E1 /* ObjectiveDropboxOfficial.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectiveDropboxOfficial.h; sourceTree = "<group>"; };
1763+
F2EBB7611D921E6C004707E1 /* DropboxSDKImportsDesktop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DropboxSDKImportsDesktop.h; sourceTree = "<group>"; };
17651764
F2EBB76D1D921E78004707E1 /* DBASYNCLaunchEmptyResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBASYNCLaunchEmptyResult.h; sourceTree = "<group>"; };
17661765
F2EBB76E1D921E78004707E1 /* DBASYNCLaunchEmptyResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBASYNCLaunchEmptyResult.m; sourceTree = "<group>"; };
17671766
F2EBB76F1D921E78004707E1 /* DBASYNCLaunchResultBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBASYNCLaunchResultBase.h; sourceTree = "<group>"; };
@@ -2681,7 +2680,6 @@
26812680
children = (
26822681
F2EBB74B1D921E63004707E1 /* Info.plist */,
26832682
F2EBB74C1D921E63004707E1 /* iOS */,
2684-
F2EBB7521D921E63004707E1 /* ObjectiveDropboxOfficial.h */,
26852683
);
26862684
path = ObjectiveDropboxOfficial_iOS;
26872685
sourceTree = "<group>";
@@ -2693,7 +2691,7 @@
26932691
F2EBB74E1D921E63004707E1 /* DBOAuthMobile.m */,
26942692
F2EBB74F1D921E63004707E1 /* DropboxClientsManager+MobileAuth.h */,
26952693
F2EBB7501D921E63004707E1 /* DropboxClientsManager+MobileAuth.m */,
2696-
F2EBB7511D921E63004707E1 /* DropboxSDKImports.h */,
2694+
F2EBB7511D921E63004707E1 /* DropboxSDKImportsMobile.h */,
26972695
);
26982696
path = iOS;
26992697
sourceTree = "<group>";
@@ -2703,7 +2701,6 @@
27032701
children = (
27042702
F2EBB75B1D921E6C004707E1 /* Info.plist */,
27052703
F2EBB75C1D921E6C004707E1 /* macOS */,
2706-
F2EBB7621D921E6C004707E1 /* ObjectiveDropboxOfficial.h */,
27072704
);
27082705
path = ObjectiveDropboxOfficial_macOS;
27092706
sourceTree = "<group>";
@@ -2715,22 +2712,23 @@
27152712
F2EBB75E1D921E6C004707E1 /* DBOAuthDesktop.m */,
27162713
F2EBB75F1D921E6C004707E1 /* DropboxClientsManager+DesktopAuth.h */,
27172714
F2EBB7601D921E6C004707E1 /* DropboxClientsManager+DesktopAuth.m */,
2718-
F2EBB7611D921E6C004707E1 /* DropboxSDKImports.h */,
2715+
F2EBB7611D921E6C004707E1 /* DropboxSDKImportsDesktop.h */,
27192716
);
27202717
path = macOS;
27212718
sourceTree = "<group>";
27222719
};
27232720
F2EBB76A1D921E78004707E1 /* PlatformNeutral */ = {
27242721
isa = PBXGroup;
27252722
children = (
2726-
F2EBB76B1D921E78004707E1 /* ApiObjects */,
2727-
F2EBBA951D921E79004707E1 /* Client */,
27282723
F2EBBA9A1D921E79004707E1 /* DropboxClient.h */,
27292724
F2EBBA9B1D921E79004707E1 /* DropboxClient.m */,
27302725
F2EBBA9C1D921E79004707E1 /* DropboxClientsManager.h */,
27312726
F2EBBA9D1D921E79004707E1 /* DropboxClientsManager.m */,
27322727
F2EBBA9E1D921E79004707E1 /* DropboxTeamClient.h */,
27332728
F2EBBA9F1D921E79004707E1 /* DropboxTeamClient.m */,
2729+
F25D1B471D95B68600B748CF /* ObjectiveDropboxOfficial.h */,
2730+
F2EBB76B1D921E78004707E1 /* ApiObjects */,
2731+
F2EBBA951D921E79004707E1 /* Client */,
27342732
F2EBBAA01D921E79004707E1 /* Networking */,
27352733
F2EBBAAE1D921E79004707E1 /* OAuth */,
27362734
F2EBBAB61D921E79004707E1 /* Resources */,
@@ -3912,7 +3910,6 @@
39123910
F2EBBCC81D921E7A004707E1 /* DBSHARINGCreateSharedLinkError.h in Headers */,
39133911
F2EBC0181D921E7B004707E1 /* DBTEAMMembersRecoverError.h in Headers */,
39143912
F2EBBB181D921E79004707E1 /* DBFILESDeletedMetadata.h in Headers */,
3915-
F2EBB7591D921E63004707E1 /* ObjectiveDropboxOfficial.h in Headers */,
39163913
F2EBBBD81D921E7A004707E1 /* DBFILESSaveCopyReferenceArg.h in Headers */,
39173914
F2EBC0601D921E7C004707E1 /* DBTEAMRevokeDeviceSessionBatchError.h in Headers */,
39183915
F2EBBFB01D921E7B004707E1 /* DBTEAMListTeamAppsError.h in Headers */,
@@ -3924,6 +3921,7 @@
39243921
F2EBBCE01D921E7A004707E1 /* DBSHARINGFileMemberActionError.h in Headers */,
39253922
F2EBBD981D921E7A004707E1 /* DBSHARINGListFoldersContinueArg.h in Headers */,
39263923
F2EBC09C1D921E7C004707E1 /* DBTEAMTeamMemberStatus.h in Headers */,
3924+
F25D1B481D95B68600B748CF /* ObjectiveDropboxOfficial.h in Headers */,
39273925
F2EBBB541D921E7A004707E1 /* DBFILESGetTemporaryLinkError.h in Headers */,
39283926
F2EBBD5C1D921E7A004707E1 /* DBSHARINGListFileMembersBatchResult.h in Headers */,
39293927
F2EBC13A1D921E7C004707E1 /* DBTasks.h in Headers */,
@@ -4071,7 +4069,7 @@
40714069
F2EBBEDC1D921E7B004707E1 /* DBTEAMDeviceSession.h in Headers */,
40724070
F2EBBFC01D921E7B004707E1 /* DBTEAMListTeamDevicesResult.h in Headers */,
40734071
F2EBBEC81D921E7B004707E1 /* DBTEAMDateRange.h in Headers */,
4074-
F2EBB7581D921E63004707E1 /* DropboxSDKImports.h in Headers */,
4072+
F2EBB7581D921E63004707E1 /* DropboxSDKImportsMobile.h in Headers */,
40754073
F2EBBE241D921E7A004707E1 /* DBSHARINGSharedFolderAccessError.h in Headers */,
40764074
F2EBBB7C1D921E7A004707E1 /* DBFILESListFolderLongpollError.h in Headers */,
40774075
F2EBC0F81D921E7C004707E1 /* DBUSERSGetAccountError.h in Headers */,
@@ -4353,7 +4351,6 @@
43534351
F2EBBCC91D921E7A004707E1 /* DBSHARINGCreateSharedLinkError.h in Headers */,
43544352
F2EBC0191D921E7B004707E1 /* DBTEAMMembersRecoverError.h in Headers */,
43554353
F2EBBB191D921E79004707E1 /* DBFILESDeletedMetadata.h in Headers */,
4356-
F2EBB7691D921E6C004707E1 /* ObjectiveDropboxOfficial.h in Headers */,
43574354
F2EBBBD91D921E7A004707E1 /* DBFILESSaveCopyReferenceArg.h in Headers */,
43584355
F2EBC0611D921E7C004707E1 /* DBTEAMRevokeDeviceSessionBatchError.h in Headers */,
43594356
F2EBBFB11D921E7B004707E1 /* DBTEAMListTeamAppsError.h in Headers */,
@@ -4365,6 +4362,7 @@
43654362
F2EBBCE11D921E7A004707E1 /* DBSHARINGFileMemberActionError.h in Headers */,
43664363
F2EBBD991D921E7A004707E1 /* DBSHARINGListFoldersContinueArg.h in Headers */,
43674364
F2EBC09D1D921E7C004707E1 /* DBTEAMTeamMemberStatus.h in Headers */,
4365+
F25D1B491D95B68600B748CF /* ObjectiveDropboxOfficial.h in Headers */,
43684366
F2EBBB551D921E7A004707E1 /* DBFILESGetTemporaryLinkError.h in Headers */,
43694367
F2EBBD5D1D921E7A004707E1 /* DBSHARINGListFileMembersBatchResult.h in Headers */,
43704368
F2EBC13B1D921E7C004707E1 /* DBTasks.h in Headers */,
@@ -4512,7 +4510,7 @@
45124510
F2EBBEDD1D921E7B004707E1 /* DBTEAMDeviceSession.h in Headers */,
45134511
F2EBBFC11D921E7B004707E1 /* DBTEAMListTeamDevicesResult.h in Headers */,
45144512
F2EBBEC91D921E7B004707E1 /* DBTEAMDateRange.h in Headers */,
4515-
F2EBB7681D921E6C004707E1 /* DropboxSDKImports.h in Headers */,
4513+
F2EBB7681D921E6C004707E1 /* DropboxSDKImportsDesktop.h in Headers */,
45164514
F2EBBE251D921E7A004707E1 /* DBSHARINGSharedFolderAccessError.h in Headers */,
45174515
F2EBBB7D1D921E7A004707E1 /* DBFILESListFolderLongpollError.h in Headers */,
45184516
F2EBC0F91D921E7C004707E1 /* DBUSERSGetAccountError.h in Headers */,

Source/ObjectiveDropboxOfficial/ObjectiveDropboxOfficial_iOS/iOS/DropboxSDKImports.h renamed to Source/ObjectiveDropboxOfficial/ObjectiveDropboxOfficial_iOS/iOS/DropboxSDKImportsMobile.h

File renamed without changes.

‎Source/ObjectiveDropboxOfficial/ObjectiveDropboxOfficial_macOS/ObjectiveDropboxOfficial.h‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

Source/ObjectiveDropboxOfficial/ObjectiveDropboxOfficial_macOS/macOS/DropboxSDKImports.h renamed to Source/ObjectiveDropboxOfficial/ObjectiveDropboxOfficial_macOS/macOS/DropboxSDKImportsDesktop.h

File renamed without changes.

Source/ObjectiveDropboxOfficial/ObjectiveDropboxOfficial_iOS/ObjectiveDropboxOfficial.h renamed to Source/ObjectiveDropboxOfficial/PlatformNeutral/ObjectiveDropboxOfficial.h

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@
55
// Copyright © 2016 Dropbox. All rights reserved.
66
//
77

8-
#import <UIKit/UIKit.h>
8+
#import "TargetConditionals.h"
9+
10+
#if TARGET_OS_IPHONE
11+
#import <UIKit/UIKit.h>
12+
#else
13+
#import <Cocoa/Cocoa.h>
14+
#endif
915

1016
//! Project version number for ObjectiveDropboxOfficial.
1117
FOUNDATION_EXPORT double ObjectiveDropboxOfficialVersionNumber;
@@ -16,4 +22,8 @@ FOUNDATION_EXPORT const unsigned char ObjectiveDropboxOfficialVersionString[];
1622
// In this header, you should import all the public headers of your framework using statements like #import
1723
// <ObjectiveDropboxOfficial/PublicHeader.h>
1824

19-
#import <ObjectiveDropboxOfficial/DropboxSDKImports.h>
25+
#if TARGET_OS_IPHONE
26+
#import <ObjectiveDropboxOfficial/DropboxSDKImportsMobile.h>
27+
#else
28+
#import <ObjectiveDropboxOfficial/DropboxSDKImportsDesktop.h>
29+
#endif

0 commit comments

Comments
 (0)