Merge pull request #276 from WideSpectrumComputing/master

release candidate: v1.12.4

CHANGELOG.md

@@ -25,6 +25,12 @@ The change log has moved to this repo's [GitHub Releases Page](https://github.co
 
 ## Release Notes
 
+**1.12.4**
+- fix: resolve PR #275: Compile without headermap, to fix header file collisions.
+- fix: resolve #244: Demangle.cpp failing to build 
+- fix: resolve #239: Compiler Issue - "'absl/base/internal/inline_variable.h' file not found"
+- chore: resolve #272: Update CocoaPods related examples to use latest pod version 
+
 **1.12.3**
 - fix: resolve #154: Reporting to multiple projects
 

Examples/iOSAppWithRollbarCocoaPod/Podfile

@@ -2,5 +2,5 @@ platform :ios, '8.0'
 use_frameworks!
 
 target 'iOSAppWithRollbarCocoaPod' do
-pod 'Rollbar', '~> 1.8.0-alpha6'
+pod 'Rollbar', '~> 1.12.3'
 end

Examples/iOSAppWithRollbarCocoaPod/Podfile.lock

@@ -1,16 +1,16 @@
 PODS:
-  - Rollbar (1.8.0-alpha6)
+  - Rollbar (1.12.3)
 
 DEPENDENCIES:
-  - Rollbar (~> 1.8.0-alpha6)
+  - Rollbar (~> 1.12.3)
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  trunk:
     - Rollbar
 
 SPEC CHECKSUMS:
-  Rollbar: 6bfbddd797ead5b91ed4e38cff9c71761fac623b
+  Rollbar: d362a41a3bb2e82586f18efcc6fa64948d264112
 
-PODFILE CHECKSUM: 0f9f30c05f9f33c413e4dc8484716a44ba02af3b
+PODFILE CHECKSUM: 5d4faa1c79fa15ba580ee28fc6ba2fc573487272
 
-COCOAPODS: 1.7.4
+COCOAPODS: 1.9.1

Examples/iOSAppWithRollbarCocoaPod/iOSAppWithRollbarCocoaPod.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		55538FF024442E2B00F5ABFA /* Podfile in Resources */ = {isa = PBXBuildFile; fileRef = 55538FEF24442E2B00F5ABFA /* Podfile */; };
 		55E7288322D7F92E007661F3 /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55E7288222D7F92E007661F3 /* NetworkExtension.framework */; };
 		55F1BBC722D6F23A00F4F958 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F1BBC622D6F23A00F4F958 /* AppDelegate.m */; };
 		55F1BBCA22D6F23A00F4F958 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F1BBC922D6F23A00F4F958 /* ViewController.m */; };
@@ -19,6 +20,7 @@
 
 /* Begin PBXFileReference section */
 		14F553DAD246167FA8E483A7 /* Pods-iOSAppWithRollbarCocoaPod.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOSAppWithRollbarCocoaPod.release.xcconfig"; path = "Target Support Files/Pods-iOSAppWithRollbarCocoaPod/Pods-iOSAppWithRollbarCocoaPod.release.xcconfig"; sourceTree = "<group>"; };
+		55538FEF24442E2B00F5ABFA /* Podfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Podfile; sourceTree = "<group>"; };
 		55E7288222D7F92E007661F3 /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NetworkExtension.framework; path = System/Library/Frameworks/NetworkExtension.framework; sourceTree = SDKROOT; };
 		55E7288422D7F92E007661F3 /* iOSAppWithRollbarCocoaPod.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = iOSAppWithRollbarCocoaPod.entitlements; sourceTree = "<group>"; };
 		55F1BBC222D6F23A00F4F958 /* iOSAppWithRollbarCocoaPod.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iOSAppWithRollbarCocoaPod.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -60,6 +62,7 @@
 		55F1BBB922D6F23A00F4F958 = {
 			isa = PBXGroup;
 			children = (
+				55538FEF24442E2B00F5ABFA /* Podfile */,
 				55F1BBC422D6F23A00F4F958 /* iOSAppWithRollbarCocoaPod */,
 				55F1BBC322D6F23A00F4F958 /* Products */,
 				37F9380CA54C0E591B785FA6 /* Pods */,
@@ -167,6 +170,7 @@
 			files = (
 				55F1BBD222D6F23D00F4F958 /* LaunchScreen.storyboard in Resources */,
 				55F1BBCF22D6F23D00F4F958 /* Assets.xcassets in Resources */,
+				55538FF024442E2B00F5ABFA /* Podfile in Resources */,
 				55F1BBCD22D6F23A00F4F958 /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

Examples/iOSAppWithRollbarCocoaPod/iOSAppWithRollbarCocoaPod/AppDelegate.m

@@ -7,7 +7,7 @@
 //
 
 #import "AppDelegate.h"
-#import <Rollbar/Rollbar.h>
+@import Rollbar;
 
 @interface AppDelegate ()
 

Examples/macOSAppWithRollbarCocoaPod/Podfile

@@ -2,5 +2,5 @@ platform :osx, '10.12'
 use_frameworks!
 
 target 'macOSAppWithRollbarCocoaPod' do
-pod 'Rollbar', '~> 1.11.3'
+pod 'Rollbar', '~> 1.12.3'
 end

Examples/macOSAppWithRollbarCocoaPod/Podfile.lock

@@ -1,16 +1,16 @@
 PODS:
-  - Rollbar (1.11.3)
+  - Rollbar (1.12.3)
 
 DEPENDENCIES:
-  - Rollbar (~> 1.11.3)
+  - Rollbar (~> 1.12.3)
 
 SPEC REPOS:
   trunk:
     - Rollbar
 
 SPEC CHECKSUMS:
-  Rollbar: e54b68c371f3599add3ff9ecfca0da27d5c62777
+  Rollbar: d362a41a3bb2e82586f18efcc6fa64948d264112
 
-PODFILE CHECKSUM: a7fa311ecad27ca193989ea794c557379543b41e
+PODFILE CHECKSUM: fb91af7a0a445c19b9a37d1faf4740e43a736ab0
 
-COCOAPODS: 1.8.4
+COCOAPODS: 1.9.1

Examples/macOSAppWithRollbarCocoaPod/macOSAppWithRollbarCocoaPod.xcodeproj/project.pbxproj

@@ -27,7 +27,7 @@
 		550647E722D4097500530813 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		550647E822D4097500530813 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		550647EA22D4097500530813 /* macOSAppWithRollbarCocoaPod.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = macOSAppWithRollbarCocoaPod.entitlements; sourceTree = "<group>"; };
-		550647F022D40E6F00530813 /* Podfile */ = {isa = PBXFileReference; lastKnownFileType = text; path = Podfile; sourceTree = SOURCE_ROOT; };
+		550647F022D40E6F00530813 /* Podfile */ = {isa = PBXFileReference; lastKnownFileType = text; path = Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		6D6F4F79D3BE3D6FA25A13A2 /* Pods-macOSAppWithRollbarCocoaPod.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-macOSAppWithRollbarCocoaPod.release.xcconfig"; path = "Target Support Files/Pods-macOSAppWithRollbarCocoaPod/Pods-macOSAppWithRollbarCocoaPod.release.xcconfig"; sourceTree = "<group>"; };
 		DB7913F8E3D95330157E60EB /* Pods-macOSAppWithRollbarCocoaPod.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-macOSAppWithRollbarCocoaPod.debug.xcconfig"; path = "Target Support Files/Pods-macOSAppWithRollbarCocoaPod/Pods-macOSAppWithRollbarCocoaPod.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */

Rollbar.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 
-  s.version                   = "1.12.3"
+  s.version                   = "1.12.4"
   s.name                      = "Rollbar"
   s.summary                   = "Objective-C library for crash reporting and logging with Rollbar. It works on iOS and macOS."
   s.description               = <<-DESC

Rollbar.xcodeproj/project.pbxproj

@@ -4451,7 +4451,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1.12.3;
+				CURRENT_PROJECT_VERSION = 1.12.4;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = LDX6L68VZJ;
 				ENABLE_BITCODE = YES;
@@ -4516,7 +4516,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 1.12.3;
+				CURRENT_PROJECT_VERSION = 1.12.4;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = LDX6L68VZJ;
 				ENABLE_BITCODE = YES;

Rollbar/Notifier/RollbarTelemetry.m

@@ -60,6 +60,7 @@ - (instancetype)init {
 
     self = [super init];
     if (self) {
+        _enabled = NO;
         _dataArray = [NSMutableArray array];
         _limit = DEFAULT_DATA_LIMIT;
 

Rollbar/Notifier_DTOs/RollbarConfig.m

@@ -23,7 +23,7 @@
 
 #pragma mark - constants
 
-static NSString * const NOTIFIER_VERSION = @"1.12.3";
+static NSString * const NOTIFIER_VERSION = @"1.12.4";
 
 #define NOTIFIER_NAME_PREFIX = @"rollbar-";
 #if TARGET_OS_IPHONE

RollbarTests/RollbarTelemetryTests.m

@@ -44,6 +44,7 @@ - (void)testTelemetryCapture {
     NSArray *logItems = RollbarReadLogItemFromFile();
     NSDictionary *item = logItems[0];
     NSArray *telemetryData = [item valueForKeyPath:@"body.telemetry"];
+    XCTAssertTrue(telemetryData.count > 0);
 
     for (NSDictionary *data in telemetryData) {
         NSDictionary *body = data[@"body"];