Merge pull request #181 from WideSpectrumComputing/GH180

Resolve GH180, GH176 and GH166

Author: akornich

CHANGELOG.md

@@ -28,6 +28,9 @@ The change log has moved to this repo's [GitHub Releases Page](https://github.co
 ### 2.3.0
 
 - feat: Detection of possible Out-of-Memory issues
+- fix: resolve #166 - v2.2.4 spams to log with NSLog on iOS
+- fix: resolve #176 - Rollbar crashes when device runs out of memory
+- fix: resolve #180 - SonarCloud: address current reliability issues
 
 ### 2.2.4
 

Package.swift

@@ -7,9 +7,9 @@ let package = Package(
     name: "RollbarSDK",
     platforms: [
         // Oldest targeted platform versions that are supported by this product.
-        .macOS(.v10_11),
-        .iOS(.v9),
-        .tvOS(.v11),
+        .macOS(.v10_15),
+        .iOS(.v13),
+        .tvOS(.v13),
         .watchOS(.v7),
     ],
     products: [

RollbarAUL.podspec

@@ -33,10 +33,10 @@ Pod::Spec.new do |s|
     # s.resources = "Resources/*.png"
 
     #  When using multiple platforms:
-    s.osx.deployment_target = "10.11"
-    # s.ios.deployment_target = "9.0"
-    # s.tvos.deployment_target = "11.0"
-    # s.watchos.deployment_target = "4.0"
+    s.osx.deployment_target = "10.15"
+    # s.ios.deployment_target = "13.0"
+    # s.tvos.deployment_target = "13.0"
+    # s.watchos.deployment_target = "7.0"
     # Any platform, if omitted:
     # s.platform     = :ios
     # s.platform     = :ios, "5.0"

RollbarAUL/Package.swift

@@ -8,8 +8,8 @@ let package = Package(
     platforms: [
         // Oldest targeted platform versions that are supported by this product.
         .macOS(.v10_15),
-        .iOS(.v9),
-        .tvOS(.v11),
+        .iOS(.v13),
+        .tvOS(.v13),
         .watchOS(.v7),
     ],
     products: [

RollbarCocoaLumberjack.podspec

@@ -33,10 +33,10 @@ Pod::Spec.new do |s|
     # s.resources = "Resources/*.png"
 
     #  When using multiple platforms:
-    s.ios.deployment_target = "9.0"
-    s.osx.deployment_target = "10.11"
-    s.tvos.deployment_target = "11.0"
-    s.watchos.deployment_target = "4.0"
+    s.osx.deployment_target = "10.15"
+    s.ios.deployment_target = "13.0"
+    s.tvos.deployment_target = "13.0"
+    s.watchos.deployment_target = "7.0"
     # Any platform, if omitted:
     # s.platform     = :ios
     # s.platform     = :ios, "5.0"

RollbarCocoaLumberjack/Package.swift

@@ -7,9 +7,9 @@ let package = Package(
     name: "RollbarCocoaLumberjack",
     platforms: [
         // Oldest targeted platform versions that are supported by this product.
-        .macOS(.v10_11),
-        .iOS(.v9),
-        .tvOS(.v11),
+        .macOS(.v10_15),
+        .iOS(.v13),
+        .tvOS(.v13),
         .watchOS(.v7),
     ],
     products: [

RollbarCommon.podspec

@@ -33,8 +33,8 @@ Pod::Spec.new do |s|
     # s.resources = "Resources/*.png"
 
     #  When using multiple platforms:
-    s.ios.deployment_target = "9.0"
     s.osx.deployment_target = "10.11"
+    s.ios.deployment_target = "9.0"
     s.tvos.deployment_target = "11.0"
     s.watchos.deployment_target = "4.0"
     # Any platform, if omitted:

RollbarCommon/Package.swift

@@ -7,10 +7,10 @@ let package = Package(
     name: "RollbarCommon",
     platforms: [
         // Oldest targeted platform versions that are supported by this product.
-        .macOS(.v10_10),
-        .iOS(.v9),
-        .tvOS(.v11),
-        .watchOS(.v4),
+        .macOS(.v10_15),
+        .iOS(.v13),
+        .tvOS(.v13),
+        .watchOS(.v7),
     ],
     products: [
         // Products define the executables and libraries produced by a package, and make them visible to other packages.

RollbarCommon/Sources/RollbarCommon/DTOs/RollbarDTO+Protected.m

@@ -116,19 +116,29 @@ - (NSNumber *)safelyGetNumberByKey:(NSString *)key {
 
 #pragma mark - data setters by key
 
-- (void)setDictionary:(NSDictionary *)data forKey:(NSString *)key {
-    [self setData:data.mutableCopy byKey:key];
+- (void)setDictionary:(nullable NSDictionary *)data forKey:(NSString *)key {
+    
+    [self setData:data ? data.mutableCopy : data
+            byKey:key
+    ];
 }
 
-- (void)setArray:(NSArray *)data forKey:(NSString *)key {
-    [self setData:data.mutableCopy byKey:key];
+- (void)setArray:(nullable NSArray *)data forKey:(NSString *)key {
+    
+    [self setData:data ? data.mutableCopy : data
+            byKey:key
+    ];
 }
 
-- (void)setString:(NSString *)data forKey:(NSString *)key {
-    [self setData:data.mutableCopy byKey:key];
+- (void)setString:(nullable NSString *)data forKey:(NSString *)key {
+    
+    [self setData:data ? data.mutableCopy : data
+            byKey:key
+    ];
 }
 
-- (void)setNumber:(NSNumber *)data forKey:(NSString *)key {
+- (void)setNumber:(nullable NSNumber *)data forKey:(NSString *)key {
+    
     [self setData:data byKey:key];
 }
 

RollbarCommon/Sources/RollbarCommon/DTOs/RollbarDTO.m

@@ -10,12 +10,21 @@ @implementation RollbarDTO {
 
 #pragma mark - JSON processing routines
 
-+ (BOOL)isTransferableObject:(id)obj {
-    BOOL result = [NSJSONSerialization isValidJSONObject:obj];
-    return result;
++ (BOOL)isTransferableObject:(nullable id)obj {
+    
+    if (obj) {
+        
+        BOOL result = [NSJSONSerialization isValidJSONObject:obj];
+        return result;
+    }
+    else {
+        
+        return NO;
+    }
 }
 
 + (BOOL)isTransferableDataValue:(id)obj {
+    
     if (obj == [NSNull null]
         || [obj isKindOfClass:[NSString class]]
         || [obj isKindOfClass:[NSNumber class]]
@@ -338,24 +347,30 @@ - (instancetype)initWithDictionary:(nullable NSDictionary<NSString *, id> *)data
     self->_dataArray = nil;
     self->_dataDictionary = nil;
 
-    if (!data) {
+    if (nil == data) {
+        
         data = [NSMutableDictionary dictionary];
     }
 
     if (![RollbarDTO isTransferableObject:data]) {
+        
         return self;
     }
 
     if ([data isKindOfClass:[NSMutableDictionary class]]) {
+        
         self->_data = (NSMutableDictionary *) data;
     }
     else {
+        
         self->_data = data.mutableCopy;
     }
     self->_dataArray = nil;
     self->_dataDictionary = (NSMutableDictionary<NSString *, id> *) self->_data;
     for (NSString *key in self->_dataDictionary.allKeys) {
+        
         if (self->_dataDictionary[key] == (id)[NSNull null]) {
+            
             [self->_dataDictionary removeObjectForKey:key];
         }
     }