Skip to content

Commit f04099c

Browse files
committed
Merge branch 'bug/iOS-issues' into develop
Undid some WS changes in the README.md and did remove the unnecessary project file changes Conflicts: README.md
2 parents dbfafcd + e5ce799 commit f04099c

File tree

2 files changed

+30
-10
lines changed

2 files changed

+30
-10
lines changed

.gitignore

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Xcode
2+
.DS_Store
3+
build/
4+
*.pbxuser
5+
!default.pbxuser
6+
*.mode1v3
7+
!default.mode1v3
8+
*.mode2v3
9+
!default.mode2v3
10+
*.perspectivev3
11+
!default.perspectivev3
12+
*.xcworkspace
13+
!default.xcworkspace
14+
xcuserdata
15+
profile
16+
*.moved-aside
17+
DerivedData
18+
.idea/

README.md

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,15 @@ Getting the sources is as easy as doing a:
2222

2323
#### iOS projects
2424

25-
- drag the OAuth2Client.xcodeproj into your project
26-
- add OAuth2Client as a build dependency
27-
- add the Security.framework as a build dependency
28-
- add `OAuth2Client/**` to your user header search path in the build settings
29-
- link your target against OAuth2Client (drag the OAuth2Client product from OAuth2Client.xcodeproj to your
30-
targets *Link Binary With Libraries*)
31-
- `#import "NXOAuth2.h"`
25+
* Place the _OAuth2Client_ folder within your source root
26+
* Drag the _OAuth2Client.xcodeproj_ into your project
27+
* Under your build target, select the _Build Phases_ tab.
28+
* Under _Target Dependencies_ add _OAuth2Client_
29+
* Under _Link Binary With Libraries_, add _libOAuth2Client.a_
30+
* Under _Build Settings_,
31+
* Add `$(SRCROOT)/path/to/OAuth2Client` _Header Search Paths_, set as _recursive_
32+
* Add `-ObjC` to _Other Linker Flags_
33+
* `#import "NXOAuth2.h"`
3234

3335
#### Desktop Mac projects
3436

@@ -130,11 +132,11 @@ The authenticated accounts can be accessed via the `NXOAuth2AccountStore`. Eithe
130132

131133
<pre>
132134
for (NXOAuth2Account *account in [[NXOAuth2AccountStore sharedStore] accounts]) {
133-
// Do something with the account
135+
// Do something with the account
134136
};
135137

136138
for (NXOAuth2Account *account in [[NXOAuth2AccountStore sharedStore] accountsWithAccountType:@"myFancyService"]) {
137-
// Do something with the account
139+
// Do something with the account
138140
};
139141

140142
NXOAuth2Account *account = [[NXOAuth2AccountStore sharedStore] accountWithIdentifier:@"...cached account id..."];
@@ -181,7 +183,7 @@ NSURLRequest *sigendRequest = [theRequest signedURLRequest];
181183
// Invoke the request with you preferd method
182184
</pre>
183185

184-
## BSD License
186+
## BSD License
185187

186188
Copyright © 2012, nxtbgthng GmbH
187189

0 commit comments

Comments
 (0)