Skip to content

Commit 94ac252

Browse files
author
Stephen Cobbe
committed
1.0.3 Release. Updated OS X references to use macOS name.
1 parent e7140d3 commit 94ac252

File tree

33 files changed

+147
-135
lines changed

33 files changed

+147
-135
lines changed

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ xcuserdata/
1919
*.xcuserstate
2020
*.xcworkspace
2121

22-
# OSX
22+
# macOS
2323
*.DS_Store
2424

2525
# Obj-C/Swift specific
@@ -29,7 +29,7 @@ xcuserdata/
2929
*.dSYM
3030

3131
# CocoaPods
32-
TestObjectiveDropbox_OSX/Pods/
32+
TestObjectiveDropbox_macOS/Pods/
3333
TestObjectiveDropbox_iOS/Pods/
3434
Examples/DBRoulette/DBRoulette/Pods/
3535

‎Format/doc_generation_imports.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#import <Foundation/Foundation.h>
2+
#import <UIKit/UIKit.h>
3+
#import <AppKit/AppKit.h>
24

5+
#import "DBErrors.h"
36
#import "DBDelegate.h"
47
#import "DBOAuthMobile.h"
58
#import "DropboxClient.h"

‎Format/generate_docs.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ else
3838
echo "Removing tmp sdk files..."
3939
rm -rf $tmp_location
4040

41-
ln -s $base_location/$sdk_version $base_location/latest
41+
cd $base_location/
42+
rm latest
43+
ln -s $sdk_version latest
44+
cd -
4245
else
4346
echo "Docs directory does not exist"
4447
fi

‎ObjectiveDropboxOfficial.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Pod::Spec.new do |s|
22
s.name = "ObjectiveDropboxOfficial"
3-
s.version = "1.0.1"
3+
s.version = "1.0.3"
44
s.summary = "Dropbox Objective C SDK for APIv2"
55
s.homepage = "https://dropbox.com/developers/"
66
s.license = "MIT"
77
s.author = { "Stephen Cobbe" => "scobbe@dropbox.com" }
88
s.source = { :git => "https://github.com/dropbox/dropbox-sdk-obj-c.git", :tag => s.version }
9-
s.osx.source_files = 'Source/ObjectiveDropboxOfficial/PlatformNeutral/**/*.{h,m}', 'Source/ObjectiveDropboxOfficial/PlatformDependent/OSX/*.{h,m}'
9+
s.osx.source_files = 'Source/ObjectiveDropboxOfficial/PlatformNeutral/**/*.{h,m}', 'Source/ObjectiveDropboxOfficial/PlatformDependent/macOS/*.{h,m}'
1010
s.ios.source_files = 'Source/ObjectiveDropboxOfficial/PlatformNeutral/**/*.{h,m}', 'Source/ObjectiveDropboxOfficial/PlatformDependent/iOS/*.{h,m}'
1111
s.requires_arc = true
1212
s.osx.deployment_target = "10.10"

‎README.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Dropbox for Objective-C
22

3-
The Official Dropbox Objective-C SDK for integrating with Dropbox [API v2](https://www.dropbox.com/developers/documentation/http/documentation) on iOS or OS X.
3+
The Official Dropbox Objective-C SDK for integrating with Dropbox [API v2](https://www.dropbox.com/developers/documentation/http/documentation) on iOS or macOS.
44

55
Full documentation [here](http://dropbox.github.io/dropbox-sdk-obj-c/api-docs/latest/).
66

77
## Requirements
88

99
- iOS 8.0+
10-
- OS X 10.10+
10+
- macOS 10.10+
1111
- Xcode 7.3+
1212

1313
## Get Started
@@ -74,7 +74,7 @@ github "https://github.com/dropbox/dropbox-sdk-obj-c" ~> 1.0.2
7474

7575
Then, run the following command to install the dependency to checkout and build the Dropbox Objective-C SDK repository:
7676

77-
### iOS
77+
#### iOS
7878

7979
```bash
8080
carthage update --platform iOS
@@ -94,7 +94,7 @@ Then, navigate to the **Input Files** section and add the following path:
9494
$(SRCROOT)/Carthage/Build/iOS/ObjectiveDropboxOfficial.framework
9595
```
9696

97-
### OS X
97+
#### macOS
9898
```bash
9999
carthage update --platform Mac
100100
```
@@ -159,8 +159,8 @@ After you've made the above changes, your application's `.plist` file should loo
159159
There are three methods to programmatically retrieve an OAuth2 access token:
160160

161161
* **Direct auth** (iOS only): This launches the official Dropbox iOS app (if installed), authenticates via the official app, then redirects back into the SDK
162-
* **In-app webview auth** (iOS, OS X): This opens a pre-built in-app webview for authenticating via the Dropbox authorization page. This is convenient because the user is never redirected outside of your app.
163-
* **External browser auth** (iOS, OS X): This launches the platform's default browser for authenticating via the Dropbox authorization page. This is desirable because it is safer for the end-user, and pre-existing session data can be used to avoid requiring the user to re-enter their Dropbox credentials.
162+
* **In-app webview auth** (iOS, macOS): This opens a pre-built in-app webview for authenticating via the Dropbox authorization page. This is convenient because the user is never redirected outside of your app.
163+
* **External browser auth** (iOS, macOS): This launches the platform's default browser for authenticating via the Dropbox authorization page. This is desirable because it is safer for the end-user, and pre-existing session data can be used to avoid requiring the user to re-enter their Dropbox credentials.
164164

165165
To facilitate the above authorization flows, you should take the following steps:
166166

@@ -178,7 +178,7 @@ To facilitate the above authorization flows, you should take the following steps
178178

179179
```
180180

181-
(for OS X)
181+
(for macOS)
182182

183183
```objective-c
184184
#import "DropboxSDKImports.h"
@@ -207,7 +207,7 @@ view controller. If you wish to authenticate via the in-app webview, then set `b
207207

208208
```
209209

210-
(for OS X)
210+
(for macOS)
211211

212212
```objective-c
213213
#import "DropboxSDKImports.h"
@@ -254,7 +254,7 @@ To handle the redirection back into the Objective-C SDK once the authentication
254254

255255
```
256256

257-
(for OS X)
257+
(for macOS)
258258

259259
```objective-c
260260
#import "DropboxSDKImports.h"
@@ -553,8 +553,8 @@ If you're interested in modifying the SDK codebase, you should take the followin
553553

554554
* clone this GitHub repository to your local filesystem
555555
* run `git submodule init` and then `git submodule update`
556-
* navigate to `TestObjectiveDropbox_[iOS|OSX]` and run `pod install`
557-
* open `TestObjectiveDropbox_[iOS|OSX]/TestObjectiveDropbox_[iOS|OSX].xcworkspace` in Xcode
556+
* navigate to `TestObjectiveDropbox_[iOS|macOS]` and run `pod install`
557+
* open `TestObjectiveDropbox_[iOS|macOS]/TestObjectiveDropbox_[iOS|macOS].xcworkspace` in Xcode
558558
* implement your changes to the SDK source code.
559559

560560
To ensure your changes have not broken any existing functionality, you can run a series of integration tests by

Source/ObjectiveDropboxOfficial/PlatformDependent/OSX/DBOAuthDesktop.h renamed to Source/ObjectiveDropboxOfficial/PlatformDependent/macOS/DBOAuthDesktop.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#import <WebKit/WebKit.h>
99

1010
///
11-
/// Platform-specific (here, OS X) shared application.
11+
/// Platform-specific (here, macOS) shared application.
1212
///
1313
/// Renders OAuth flow and implements `DBSharedApplication` protocol.
1414
///
@@ -32,7 +32,7 @@
3232
@end
3333

3434
///
35-
/// Platform-specific (here, OS X) `NSViewController` for rendering OAuth flow.
35+
/// Platform-specific (here, macOS) `NSViewController` for rendering OAuth flow.
3636
///
3737
@interface DBDesktopWebViewController : NSViewController <NSWindowDelegate, WKNavigationDelegate>
3838

Source/ObjectiveDropboxOfficial/PlatformDependent/OSX/DBOAuthDesktop.m renamed to Source/ObjectiveDropboxOfficial/PlatformDependent/macOS/DBOAuthDesktop.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ - (void)presentErrorMessageWithHandlers:(NSString * _Nonnull)message
4747
}
4848

4949
- (BOOL)presentPlatformSpecificAuth:(NSURL * _Nonnull)authURL {
50-
// no platform-specific auth methods for OS X
50+
// no platform-specific auth methods for macOS
5151
return NO;
5252
}
5353

Source/ObjectiveDropboxOfficial/PlatformDependent/OSX/DropboxClientsManager+DesktopAuth.h renamed to Source/ObjectiveDropboxOfficial/PlatformDependent/macOS/DropboxClientsManager+DesktopAuth.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@class NSViewController;
1212

1313
///
14-
/// Code with platform-specific (here, OS X) dependencies.
14+
/// Code with platform-specific (here, macOS) dependencies.
1515
///
1616
/// Extends functionality of the `DropboxClientsManager` class.
1717
///

Source/ObjectiveDropboxOfficial/PlatformDependent/OSX/DropboxClientsManager+DesktopAuth.m renamed to Source/ObjectiveDropboxOfficial/PlatformDependent/macOS/DropboxClientsManager+DesktopAuth.m

File renamed without changes.

‎Source/ObjectiveDropboxOfficial/PlatformNeutral/Networking/DBErrors.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,14 @@
204204

205205
#pragma mark - Client error
206206

207+
///
208+
/// Client side request error.
209+
///
210+
/// Contains relevant information regarding a failed network
211+
/// request. Initialized in the event of a client-side error,
212+
/// like an invalid url host, or making a request when not connected
213+
/// to the internet.
214+
///
207215
@interface DBRequestClientError : NSObject
208216

209217
/// The client-side `NSError` object returned from the failed response.
@@ -257,6 +265,7 @@
257265

258266
#pragma mark - Tag type definition
259267

268+
/// Represents the possible error types that can be returned from network requests.
260269
typedef NS_ENUM(NSInteger, DBRequestErrorTag) {
261270
/// Errors produced at the HTTP layer.
262271
DBRequestErrorHttp,

0 commit comments

Comments
 (0)