Merge pull request #216 from WideSpectrumComputing/master

feat: resolve #215
rollbar · Nov 6, 2019 · be986bc · be986bc
2 parents 7683121 + f1751f6
commit be986bc
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,11 +24,13 @@ The change log has moved to this repo's [GitHub Releases Page](https://github.co
     depending on what is more appropriate in each case.
 
 ## Release Notes
+**1.9.1**
+- feat: resolve #215: Change client.os element back to client.ios to fix dSYMs application
 
 **1.9.0**
-- feat: ref #194: Capture relevant notifier config with every payload.
-- feat: ref #205: Reimplement RollbarConfiguration as a Rollbar DTO
-- feat: ref #204: Build JSON serializable base for Rollbar DTOs
+- feat: resolve #194: Capture relevant notifier config with every payload.
+- feat: resolve #205: Reimplement RollbarConfiguration as a Rollbar DTO
+- feat: resolve #204: Build JSON serializable base for Rollbar DTOs
 - chore: bumped the version up
 
 **1.8.4**

diff --git a/Examples/RollbarWithinAnotherFramework/KnobControl/KnobControl.xcodeproj/project.pbxproj b/Examples/RollbarWithinAnotherFramework/KnobControl/KnobControl.xcodeproj/project.pbxproj
@@ -328,7 +328,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
-				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;

diff --git a/Examples/RollbarWithinAnotherFramework/KnobShowcase/KnobShowcase.xcodeproj/project.pbxproj b/Examples/RollbarWithinAnotherFramework/KnobShowcase/KnobShowcase.xcodeproj/project.pbxproj
@@ -359,6 +359,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = LDX6L68VZJ;
 				INFOPLIST_FILE = KnobShowcase/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;

diff --git a/Rollbar.podspec b/Rollbar.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 
-  s.version                   = "1.9.0"
+  s.version                   = "1.9.1"
   s.name                      = "Rollbar"
   s.summary                   = "Objective-C library for crash reporting and logging with Rollbar. It works on iOS and macOS."
   s.description               = <<-DESC

diff --git a/Rollbar.xcodeproj/project.pbxproj b/Rollbar.xcodeproj/project.pbxproj
@@ -3911,7 +3911,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1.9.0;
+				CURRENT_PROJECT_VERSION = 1.9.1;
 				DEVELOPMENT_TEAM = LDX6L68VZJ;
 				ENABLE_BITCODE = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -3972,7 +3972,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 1.9.0;
+				CURRENT_PROJECT_VERSION = 1.9.1;
 				DEVELOPMENT_TEAM = LDX6L68VZJ;
 				ENABLE_BITCODE = YES;
 				ENABLE_NS_ASSERTIONS = NO;

diff --git a/Rollbar/DTOs/RollbarConfig.m b/Rollbar/DTOs/RollbarConfig.m
@@ -23,7 +23,7 @@
 
 #pragma mark - constants
 
-static NSString * const NOTIFIER_VERSION = @"1.9.0";
+static NSString * const NOTIFIER_VERSION = @"1.9.1";
 
 #define NOTIFIER_NAME_PREFIX = @"rollbar-";
 #if TARGET_OS_IPHONE

diff --git a/Rollbar/RollbarNotifier.m b/Rollbar/RollbarNotifier.m
@@ -381,15 +381,15 @@ - (NSDictionary*)buildClientData {
 
     if (self.configuration.captureIp == CaptureIpFull) {
         return @{@"timestamp": timestamp,
-                 @"os": osData,
+                 @"ios": osData,
                  @"user_ip": @"$remote_ip"};
     } else if (self.configuration.captureIp == CaptureIpAnonymize) {
         return @{@"timestamp": timestamp,
-                 @"os": osData,
+                 @"ios": osData,
                  @"user_ip": @"$remote_ip_anonymize"};
     } else {
         return @{@"timestamp": timestamp,
-                 @"os": osData
+                 @"ios": osData
                  };
     }
 }