Merge branch 'master' of github.com:rollbar/rollbar-ios

rollbar · Apr 2, 2014 · a79a653 · a79a653
2 parents da4c34b + 6317a40
commit a79a653
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -150,8 +150,27 @@ To automatically send .dSYM files to Rollbar whenever your app is built in relea
 
 ## Developing and building the library ##
 
-You can include the Rollbar project as a sub-project in your app, or link the Rollbar source files directly into your app.
-
+You can include the Rollbar project as a sub-project in your app, or link the Rollbar source files directly into your app. 
+To develop the library by linking the source files directly in your app:
+
+1. Fork this repo
+2. git clone your fork
+3. In Xcode, remove the Rollbar files from your project if they are currently there
+4. In Xcode, add the Rollbar/ files:
+    1. Right-click your project
+    2. Click "Add Files to <project name>"
+    3. Navigate to your rollbar-ios clone and select the Rollbar folder
+    4. Click "Add"
+5. In Xcode, add the PLCrashReporter framework:
+    1. Click your project
+    2. Click the General settings tab
+    3. Under "Linked Frameworks and Libraries", click the +
+    4. Click "Add Other..."
+    5. Navigate to your rollbar-ios clone, then Vendor/
+    6. Select CrashReporter.framework and click "Open"
+
+You should now be able to build your app with your local clone of rollbar-ios.
+
 To build the Rollbar framework distribution files, open the Rollbar project and make sure the Distribution scheme is active by selecting _Editor_ -> _Scheme_ -> _Distribution_. Building the project with this scheme selected will create a `Dist/` directory containing the Rollbar framework with the proper fat binary.
 
 

diff --git a/Rollbar/Rollbar.h b/Rollbar/Rollbar.h
@@ -3,7 +3,7 @@
 //  Rollbar
 //
 //  Created by Sergei Bezborodko on 3/18/14.
-//  Copyright (c) 2014 Rollbar. All rights reserved.
+//  Copyright (c) 2014 Rollbar, Inc. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

diff --git a/Rollbar/Rollbar.m b/Rollbar/Rollbar.m
@@ -3,7 +3,7 @@
 //  Rollbar
 //
 //  Created by Sergei Bezborodko on 3/18/14.
-//  Copyright (c) 2014 Rollbar. All rights reserved.
+//  Copyright (c) 2014 Rollbar, Inc. All rights reserved.
 //
 
 #import "Rollbar.h"

diff --git a/Rollbar/RollbarConfiguration.h b/Rollbar/RollbarConfiguration.h
@@ -3,7 +3,7 @@
 //  Rollbar
 //
 //  Created by Sergei Bezborodko on 3/21/14.
-//  Copyright (c) 2014 Rollbar. All rights reserved.
+//  Copyright (c) 2014 Rollbar, Inc. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

diff --git a/Rollbar/RollbarConfiguration.m b/Rollbar/RollbarConfiguration.m
@@ -3,7 +3,7 @@
 //  Rollbar
 //
 //  Created by Sergei Bezborodko on 3/21/14.
-//  Copyright (c) 2014 Rollbar. All rights reserved.
+//  Copyright (c) 2014 Rollbar, Inc. All rights reserved.
 //
 
 #import "RollbarConfiguration.h"

diff --git a/Rollbar/RollbarNotifier.h b/Rollbar/RollbarNotifier.h
@@ -3,7 +3,7 @@
 //  Rollbar
 //
 //  Created by Sergei Bezborodko on 3/18/14.
-//  Copyright (c) 2014 Rollbar. All rights reserved.
+//  Copyright (c) 2014 Rollbar, Inc. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

diff --git a/Rollbar/RollbarNotifier.m b/Rollbar/RollbarNotifier.m
@@ -3,7 +3,7 @@
 //  Rollbar
 //
 //  Created by Sergei Bezborodko on 3/18/14.
-//  Copyright (c) 2014 Rollbar. All rights reserved.
+//  Copyright (c) 2014 Rollbar, Inc. All rights reserved.
 //
 
 #import "RollbarNotifier.h"
@@ -150,14 +150,14 @@ - (void)sendPayload:(NSData*)payload {
 
     [NSURLConnection sendAsynchronousRequest:request queue:[[NSOperationQueue alloc] init] completionHandler:^(NSURLResponse *response, NSData *data, NSError *error) {
         if (error) {
-            NSLog(@"Error %@; %@", error, [error localizedDescription]);
+            NSLog(@"[Rollbar] Error %@; %@", error, [error localizedDescription]);
         } else {
             NSHTTPURLResponse* httpResponse = (NSHTTPURLResponse*)response;
             if ([httpResponse statusCode] == 200) {
-                NSLog(@"Success");
+                NSLog(@"[Rollbar] Success");
             } else {
-                NSLog(@"There was a problem reporting to Rollbar");
-                NSLog(@"Response: %@", [NSJSONSerialization JSONObjectWithData:data options:0 error:nil]);
+                NSLog(@"[Rollbar] There was a problem reporting to Rollbar");
+                NSLog(@"[Rollbar] Response: %@", [NSJSONSerialization JSONObjectWithData:data options:0 error:nil]);
             }
         }
     }];