Merge pull request #386 from dropbox/objc-shim

Point to latest stone and rerun codegen

Author: Julian Locke

Source/ObjectiveDropboxOfficial/Shared/Generated/DBSDKImportsGenerated.h

@@ -7,38 +7,37 @@
 /// Import autogenerated files
 
 // Routes
-#import "DBACCOUNTUserAuthRoutes.h"
 #import "DBACCOUNTRouteObjects.h"
-#import "DBAUTHUserAuthRoutes.h"
+#import "DBACCOUNTUserAuthRoutes.h"
 #import "DBAUTHAppAuthRoutes.h"
 #import "DBAUTHRouteObjects.h"
-#import "DBCHECKUserAuthRoutes.h"
+#import "DBAUTHUserAuthRoutes.h"
 #import "DBCHECKAppAuthRoutes.h"
 #import "DBCHECKRouteObjects.h"
-#import "DBCONTACTSUserAuthRoutes.h"
+#import "DBCHECKUserAuthRoutes.h"
 #import "DBCONTACTSRouteObjects.h"
-#import "DBFILEPROPERTIESUserAuthRoutes.h"
-#import "DBFILEPROPERTIESTeamAuthRoutes.h"
+#import "DBCONTACTSUserAuthRoutes.h"
 #import "DBFILEPROPERTIESRouteObjects.h"
-#import "DBFILEREQUESTSUserAuthRoutes.h"
+#import "DBFILEPROPERTIESTeamAuthRoutes.h"
+#import "DBFILEPROPERTIESUserAuthRoutes.h"
 #import "DBFILEREQUESTSRouteObjects.h"
-#import "DBFILESUserAuthRoutes.h"
+#import "DBFILEREQUESTSUserAuthRoutes.h"
 #import "DBFILESAppAuthRoutes.h"
 #import "DBFILESRouteObjects.h"
-#import "DBOPENIDUserAuthRoutes.h"
+#import "DBFILESUserAuthRoutes.h"
 #import "DBOPENIDRouteObjects.h"
-#import "DBPAPERUserAuthRoutes.h"
+#import "DBOPENIDUserAuthRoutes.h"
 #import "DBPAPERRouteObjects.h"
-#import "DBSHARINGUserAuthRoutes.h"
+#import "DBPAPERUserAuthRoutes.h"
 #import "DBSHARINGAppAuthRoutes.h"
 #import "DBSHARINGRouteObjects.h"
-#import "DBTEAMTeamAuthRoutes.h"
-#import "DBTEAMRouteObjects.h"
-#import "DBTEAMLOGTeamAuthRoutes.h"
+#import "DBSHARINGUserAuthRoutes.h"
 #import "DBTEAMLOGRouteObjects.h"
-#import "DBUSERSUserAuthRoutes.h"
+#import "DBTEAMLOGTeamAuthRoutes.h"
+#import "DBTEAMRouteObjects.h"
+#import "DBTEAMTeamAuthRoutes.h"
 #import "DBUSERSRouteObjects.h"
-
+#import "DBUSERSUserAuthRoutes.h"
 
 // `Account` namespace types
 
@@ -47,7 +46,6 @@
 #import "DBACCOUNTSetProfilePhotoError.h"
 #import "DBACCOUNTSetProfilePhotoResult.h"
 
-
 // `Async` namespace types
 
 #import "DBASYNCLaunchEmptyResult.h"
@@ -57,7 +55,6 @@
 #import "DBASYNCPollError.h"
 #import "DBASYNCPollResultBase.h"
 
-
 // `Auth` namespace types
 
 #import "DBAUTHAccessError.h"
@@ -71,13 +68,11 @@
 #import "DBAUTHTokenFromOAuth1Result.h"
 #import "DBAUTHTokenScopeError.h"
 
-
 // `Check` namespace types
 
 #import "DBCHECKEchoArg.h"
 #import "DBCHECKEchoResult.h"
 
-
 // `Common` namespace types
 
 #import "DBCOMMONPathRoot.h"
@@ -86,13 +81,11 @@
 #import "DBCOMMONTeamRootInfo.h"
 #import "DBCOMMONUserRootInfo.h"
 
-
 // `Contacts` namespace types
 
 #import "DBCONTACTSDeleteManualContactsArg.h"
 #import "DBCONTACTSDeleteManualContactsError.h"
 
-
 // `FileProperties` namespace types
 
 #import "DBFILEPROPERTIESAddPropertiesArg.h"
@@ -135,7 +128,6 @@
 #import "DBFILEPROPERTIESUpdateTemplateArg.h"
 #import "DBFILEPROPERTIESUpdateTemplateResult.h"
 
-
 // `FileRequests` namespace types
 
 #import "DBFILEREQUESTSCountFileRequestsError.h"
@@ -164,7 +156,6 @@
 #import "DBFILEREQUESTSUpdateFileRequestDeadline.h"
 #import "DBFILEREQUESTSUpdateFileRequestError.h"
 
-
 // `Files` namespace types
 
 #import "DBFILESAddTagArg.h"
@@ -367,15 +358,13 @@
 #import "DBFILESWriteError.h"
 #import "DBFILESWriteMode.h"
 
-
 // `Openid` namespace types
 
 #import "DBOPENIDOpenIdError.h"
 #import "DBOPENIDUserInfoArgs.h"
 #import "DBOPENIDUserInfoError.h"
 #import "DBOPENIDUserInfoResult.h"
 
-
 // `Paper` namespace types
 
 #import "DBPAPERAddMember.h"
@@ -429,17 +418,14 @@
 #import "DBPAPERUserInfoWithPermissionLevel.h"
 #import "DBPAPERUserOnPaperDocFilter.h"
 
-
 // `SecondaryEmails` namespace types
 
 #import "DBSECONDARYEMAILSSecondaryEmail.h"
 
-
 // `SeenState` namespace types
 
 #import "DBSEENSTATEPlatformType.h"
 
-
 // `Sharing` namespace types
 
 #import "DBSHARINGAccessInheritance.h"
@@ -603,7 +589,6 @@
 #import "DBSHARINGVisibilityPolicy.h"
 #import "DBSHARINGVisibilityPolicyDisallowedReason.h"
 
-
 // `Team` namespace types
 
 #import "DBTEAMActiveWebSession.h"
@@ -872,7 +857,6 @@
 #import "DBTEAMUserSelectorError.h"
 #import "DBTEAMUsersSelectorArg.h"
 
-
 // `TeamCommon` namespace types
 
 #import "DBTEAMCOMMONGroupManagementType.h"
@@ -881,7 +865,6 @@
 #import "DBTEAMCOMMONMemberSpaceLimitType.h"
 #import "DBTEAMCOMMONTimeRange.h"
 
-
 // `TeamLog` namespace types
 
 #import "DBTEAMLOGAccessMethodLogInfo.h"
@@ -2070,7 +2053,6 @@
 #import "DBTEAMLOGWebSessionsFixedLengthPolicy.h"
 #import "DBTEAMLOGWebSessionsIdleLengthPolicy.h"
 
-
 // `TeamPolicies` namespace types
 
 #import "DBTEAMPOLICIESCameraUploadsPolicyState.h"
@@ -2104,7 +2086,6 @@
 #import "DBTEAMPOLICIESTwoStepVerificationPolicy.h"
 #import "DBTEAMPOLICIESTwoStepVerificationState.h"
 
-
 // `Users` namespace types
 
 #import "DBUSERSAccount.h"
@@ -2129,8 +2110,6 @@
 #import "DBUSERSUserFeaturesGetValuesBatchError.h"
 #import "DBUSERSUserFeaturesGetValuesBatchResult.h"
 
-
 // `UsersCommon` namespace types
 
 #import "DBUSERSCOMMONAccountType.h"
-

Source/ObjectiveDropboxOfficial/Shared/Generated/Routes/DBFILEREQUESTSUserAuthRoutes.h

@@ -124,32 +124,32 @@ NS_ASSUME_NONNULL_BEGIN
 /// file requests with destinations in the app folder.
 ///
 ///
-/// @return Through the response callback, the caller will receive a `DBFILEREQUESTSListFileRequestsV2Result` object on
+/// @return Through the response callback, the caller will receive a `DBFILEREQUESTSListFileRequestsResult` object on
 /// success or a `DBFILEREQUESTSListFileRequestsError` object on failure.
 ///
-- (DBRpcTask<DBFILEREQUESTSListFileRequestsV2Result *, DBFILEREQUESTSListFileRequestsError *> *)listV2;
+- (DBRpcTask<DBFILEREQUESTSListFileRequestsResult *, DBFILEREQUESTSListFileRequestsError *> *)list;
 
 ///
 /// Returns a list of file requests owned by this user. For apps with the app folder permission, this will only return
 /// file requests with destinations in the app folder.
 ///
-/// @param limit The maximum number of file requests that should be returned per request.
 ///
 /// @return Through the response callback, the caller will receive a `DBFILEREQUESTSListFileRequestsV2Result` object on
 /// success or a `DBFILEREQUESTSListFileRequestsError` object on failure.
 ///
-- (DBRpcTask<DBFILEREQUESTSListFileRequestsV2Result *, DBFILEREQUESTSListFileRequestsError *> *)listV2:
-    (nullable NSNumber *)limit;
+- (DBRpcTask<DBFILEREQUESTSListFileRequestsV2Result *, DBFILEREQUESTSListFileRequestsError *> *)listV2;
 
 ///
 /// Returns a list of file requests owned by this user. For apps with the app folder permission, this will only return
 /// file requests with destinations in the app folder.
 ///
+/// @param limit The maximum number of file requests that should be returned per request.
 ///
-/// @return Through the response callback, the caller will receive a `DBFILEREQUESTSListFileRequestsResult` object on
+/// @return Through the response callback, the caller will receive a `DBFILEREQUESTSListFileRequestsV2Result` object on
 /// success or a `DBFILEREQUESTSListFileRequestsError` object on failure.
 ///
-- (DBRpcTask<DBFILEREQUESTSListFileRequestsResult *, DBFILEREQUESTSListFileRequestsError *> *)list;
+- (DBRpcTask<DBFILEREQUESTSListFileRequestsV2Result *, DBFILEREQUESTSListFileRequestsError *> *)listV2:
+    (nullable NSNumber *)limit;
 
 ///
 /// Once a cursor has been retrieved from `list`, use this to paginate through all file requests. The cursor must come

Source/ObjectiveDropboxOfficial/Shared/Generated/Routes/DBFILEREQUESTSUserAuthRoutes.m

@@ -87,6 +87,11 @@ - (DBRpcTask *)get:(NSString *)id_ {
   return [self.client requestRpc:route arg:arg];
 }
 
+- (DBRpcTask *)list {
+  DBRoute *route = DBFILEREQUESTSRouteObjects.DBFILEREQUESTSList;
+  return [self.client requestRpc:route arg:nil];
+}
+
 - (DBRpcTask *)listV2 {
   DBRoute *route = DBFILEREQUESTSRouteObjects.DBFILEREQUESTSListV2;
   DBFILEREQUESTSListFileRequestsArg *arg = [[DBFILEREQUESTSListFileRequestsArg alloc] initDefault];
@@ -99,11 +104,6 @@ - (DBRpcTask *)listV2:(NSNumber *)limit {
   return [self.client requestRpc:route arg:arg];
 }
 
-- (DBRpcTask *)list {
-  DBRoute *route = DBFILEREQUESTSRouteObjects.DBFILEREQUESTSList;
-  return [self.client requestRpc:route arg:nil];
-}
-
 - (DBRpcTask *)listContinue:(NSString *)cursor {
   DBRoute *route = DBFILEREQUESTSRouteObjects.DBFILEREQUESTSListContinue;
   DBFILEREQUESTSListFileRequestsContinueArg *arg =