Merge pull request #71 from airbrake/jh-v4.2

New release 4.2.5
airbrake · May 27, 2016 · 4f386c2 · 4f386c2
2 parents 29eddda + 1d98c3d
commit 4f386c2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/Airbrake-iOS.podspec b/Airbrake-iOS.podspec
@@ -2,7 +2,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "Airbrake-iOS"
-  s.version      = "4.2.4"
+  s.version      = "4.2.5"
   s.summary      = "An Airbrake Notifier for iOS"
 
   s.description  = <<-DESC
@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
 
   s.platform     = :ios, "6.0"
 
-  s.source       = { :git => "https://github.com/airbrake/airbrake-ios.git", :tag => "4.2.4" }
+  s.source       = { :git => "https://github.com/airbrake/airbrake-ios.git", :tag => "4.2.5" }
 
   s.source_files  = "Airbrake/{notifier,gcalertview}/*.{h,m}", "Airbrake/CrashReporter.framework/Versions/A/Headers/*.h"
 

diff --git a/Airbrake/notifier/ABNotice.m b/Airbrake/notifier/ABNotice.m
@@ -245,7 +245,7 @@ -(NSDictionary *)getNoticeDictionary
             return nil;
         }
     }
-    notice = @{@"notifier": @{@"name":self.executable, @"version":ABNotifierApplicationVersion(), @"url":self.executable},@"errors":@[@{@"type":self.exceptionName,@"message":self.exceptionReason, @"backtrace":backtrace}], @"context":@{@"os": ABNotifierOperatingSystemVersion(),@"language":ABNotifierPlatformName(), @"environment":self.environmentName,@"version":ABNotifierApplicationVersion(),@"userName":[self getPostUserName]},@"environment":@{@"name": self.environmentName},@"params":self.environmentInfo};
+    notice = @{@"errors":@[@{@"type":self.exceptionName,@"message":self.exceptionReason, @"backtrace":backtrace}], @"context":@{@"notifier":@{@"name":ABNotifierName,@"version":ABNotifierVersion,@"url":@"https://github.com/airbrake/airbrake-ios"},@"os": ABNotifierOperatingSystemVersion(),@"language":ABNotifierPlatformName(), @"environment":self.environmentName,@"version":ABNotifierApplicationVersion(),@"userName":[self getPostUserName]},@"environment":@{@"name": self.environmentName},@"params":self.environmentInfo};
     } @catch (NSException *exception) {
         ABLog(@"ERROR: custom notice dictionary failed : %@", [exception reason]);
     }

diff --git a/Airbrake/notifier/ABNotifier.h b/Airbrake/notifier/ABNotifier.h
@@ -26,8 +26,8 @@
 #import <SystemConfiguration/SystemConfiguration.h>
 #if TARGET_OS_IPHONE
 #import <UIKit/UIKit.h>
-    #ifndef __IPHONE_5_0
-        #error This version of the Airbrake notifier requires iOS 5.0 or later
+    #ifndef __IPHONE_6_0
+        #error This version of the Airbrake notifier requires iOS 6.0 or later
     #endif
 #elif TARGET_OS_MAC
 #import <Cocoa/Cocoa.h>
@@ -41,6 +41,7 @@
 #import "ABNotifierDelegate.h"
 
 // notifier version
+extern NSString * const ABNotifierName;
 extern NSString * const ABNotifierVersion;
 
 /*

diff --git a/Airbrake/notifier/ABNotifier.m b/Airbrake/notifier/ABNotifier.m
@@ -46,7 +46,8 @@ of this software and associated documentation files (the "Software"), to deal
 NSString * const ABNotifierDidDismissAlertNotification      = @"ABNotifierDidDismissAlert";
 NSString * const ABNotifierWillPostNoticesNotification      = @"ABNotifierWillPostNotices";
 NSString * const ABNotifierDidPostNoticesNotification       = @"ABNotifierDidPostNotices";
-NSString * const ABNotifierVersion                          = @"4.2";
+NSString * const ABNotifierVersion                          = @"4.4";
+NSString * const ABNotifierName                             = @"Airbrake-iOS";
 NSString * const ABNotifierDevelopmentEnvironment           = @"Development";
 NSString * const ABNotifierAdHocEnvironment                 = @"Ad Hoc";
 NSString * const ABNotifierAppStoreEnvironment              = @"App Store";
@@ -496,7 +497,7 @@ + (NSData *)JSONString:(NSString *)filePath {
         ABLog(@"ERROR: Crash report data is not readable.");
         return jsonData;
     }
-    NSDictionary *notice = @{@"report": dataStr, @"context":@{@"userName":__userName, @"environment":__envName}};
+    NSDictionary *notice = @{@"report": dataStr, @"context":@{@"userName":__userName, @"environment":__envName, @"notifier":@{@"name":ABNotifierName,@"version":ABNotifierVersion,@"url":@"https://github.com/airbrake/airbrake-ios"}}};
     jsonData = [NSJSONSerialization dataWithJSONObject:notice options:NSJSONWritingPrettyPrinted error:&jsonSerializationError];
     if(jsonSerializationError) {
         jsonData = nil;

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ The Airbrake iOS/Mac OS Notifier is designed to give developers instant notifica
 
 If you have questions or need support, please visit [Airbrake support](http://help.airbrake.io/discussions/ios-notifier)
 
-The notifier requires iOS 5.0 or higher for iOS projects and Mac OS 10.7 or higher for Mac OS projects. It's also compitable with Swift. Current iOS Notifier version is 4.2.
+The notifier requires iOS 6.0 or higher for iOS projects and Mac OS 10.7 or higher for Mac OS projects. It's also compitable with Swift. Current iOS Notifier version is 4.2.5.
 
 # Signals