Merge pull request #263 from WideSpectrumComputing/master

Release candidate: v1.12.0
rollbar · Mar 11, 2020 · 6930cbd · 6930cbd
2 parents 8c6c1b3 + 0ac4f5a
commit 6930cbd
Show file tree

Hide file tree

Showing 145 changed files with 3,198 additions and 1,341 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,16 @@ The change log has moved to this repo's [GitHub Releases Page](https://github.co
 
 ## Release Notes
 
+**1.12.0**
+- feat: resolve #261: Turn telemetry events into DTOs
+- refactor: resolve #262: Improve codebase layout by logically grouping source code files
+- refactor: resolve #256: Refactor RollbarTelemetry implementation.
+- refactor: resolve #255: Mark deprecated public API with proper deprecated attribute.
+- refactor: resolve #259: Refactor RollbarNotifier's initializers
+- chore: resolve #260: Remove dead code from RollbarNotifier
+- test: resolve #257: Fix failing testErrorReportingWithTelemetry unit test
+- test: resolve #258: Fix deprecated API warnings in unit-test builds
+
 **1.11.6**
 **1.11.5**
 - fix: resolve #253: fix the podspec issue

diff --git a/Examples/macOScmdTool_Workspace/macOScmdTool.xcodeproj/project.pbxproj b/Examples/macOScmdTool_Workspace/macOScmdTool.xcodeproj/project.pbxproj
@@ -7,20 +7,13 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		551929C322CAC42500CC7FFF /* libRollbar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 554026EA22CAC0650004057A /* libRollbar.a */; };
+		5510630D24185AF900AD051A /* Rollbar.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 554026F022CAC0650004057A /* Rollbar.framework */; };
+		5510630E24185AF900AD051A /* Rollbar.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 554026F022CAC0650004057A /* Rollbar.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		553CB60522C6FC8400E0F4A4 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 553CB60422C6FC8400E0F4A4 /* main.m */; };
 		553CB63422CA87E300E0F4A4 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 553CB63322CA87E300E0F4A4 /* libc++.tbd */; };
-		55D1BE9A23FCFF5300B24754 /* libRollbar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 554026EA22CAC0650004057A /* libRollbar.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		551929B722CAC2C600CC7FFF /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 554026D422CAC0650004057A /* Rollbar.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 554549DC22C68E8F00D4A414;
-			remoteInfo = "Rollbar-macOS";
-		};
 		554026E722CAC0650004057A /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 554026D422CAC0650004057A /* Rollbar.xcodeproj */;
@@ -66,6 +59,17 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
+		5510630F24185AFA00AD051A /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				5510630E24185AF900AD051A /* Rollbar.framework in Embed Frameworks */,
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		553CB5FF22C6FC8400E0F4A4 /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -89,9 +93,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				55D1BE9A23FCFF5300B24754 /* libRollbar.a in Frameworks */,
-				551929C322CAC42500CC7FFF /* libRollbar.a in Frameworks */,
 				553CB63422CA87E300E0F4A4 /* libc++.tbd in Frameworks */,
+				5510630D24185AF900AD051A /* Rollbar.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -166,11 +169,11 @@
 				553CB5FD22C6FC8400E0F4A4 /* Sources */,
 				553CB5FE22C6FC8400E0F4A4 /* Frameworks */,
 				553CB5FF22C6FC8400E0F4A4 /* CopyFiles */,
+				5510630F24185AFA00AD051A /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				551929B822CAC2C600CC7FFF /* PBXTargetDependency */,
 			);
 			name = macOScmdTool;
 			productName = macOScmdTool;
@@ -270,14 +273,6 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-		551929B822CAC2C600CC7FFF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = "Rollbar-macOS";
-			targetProxy = 551929B722CAC2C600CC7FFF /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
 /* Begin XCBuildConfiguration section */
 		553CB60622C6FC8400E0F4A4 /* Debug */ = {
 			isa = XCBuildConfiguration;

diff --git a/Examples/macOScmdTool_Workspace/macOScmdTool/main.m b/Examples/macOScmdTool_Workspace/macOScmdTool/main.m
@@ -7,11 +7,12 @@
 //
 
 #import <Foundation/Foundation.h>
-//#import "../../../Rollbar/RollbarFacade.h"
-//#import "../../../Rollbar/DTOs/RollbarLevel.h"
-//#import "../../../Rollbar/RollbarConfiguration.h"
-//#import "../../../Rollbar/RollbarTelemetry.h"
+//#import "../../../Rollbar/Notifier_DTOs/RollbarLevel.h"
+//#import "../../../Rollbar/Notifier/RollbarFacade.h"
+//#import "../../../Rollbar/Notifier/RollbarConfiguration.h"
+//#import "../../../Rollbar/Notifier/RollbarTelemetry.h"
 //#import <NSJSONSerialization+Rollbar.h>
+
 @import Rollbar;
 
 @interface BuggyClass : NSObject

diff --git a/Rollbar.podspec b/Rollbar.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 
-  s.version                   = "1.11.6"
+  s.version                   = "1.12.0"
   s.name                      = "Rollbar"
   s.summary                   = "Objective-C library for crash reporting and logging with Rollbar. It works on iOS and macOS."
   s.description               = <<-DESC
@@ -21,64 +21,94 @@ Pod::Spec.new do |s|
                            }
 
   s.source_files        = 'KSCrash/Source/KSCrash/**/*.{m,h,mm,c,cpp}',
+
                           'Rollbar/*.{h,m}',
-                          'Rollbar/DTOs/*.{h,m}',
+
+                          'Rollbar/Abstraction_Common/*.{h,m}',
+                          'Rollbar/Abstraction_DTO/*.{h,m}',
+                          'Rollbar/Abstraction_Deploys/*.{h,m}',
+
+                          'Rollbar/Common/*.{h,m}',
+
+                          'Rollbar/Notifier/*.{h,m}',
+                          'Rollbar/Notifier_DTOs/*.{h,m}',
+
                           'Rollbar/Deploys/*.{h,m}'
+                          'Rollbar/Deploys_DTOs/*.{h,m}'
 
   s.public_header_files =
-                            'Rollbar/Rollbar.h',
-                            'Rollbar/RollbarFacade.h',
-                            'Rollbar/RollbarNotifier.h',
-                            'Rollbar/RollbarConfiguration.h',
-                            'Rollbar/RollbarTelemetry.h',
-                            'Rollbar/RollbarTelemetryType.h',
-                            'Rollbar/RollbarLog.h',
-                            'Rollbar/RollbarJSONFriendlyProtocol.h',
-                            'Rollbar/RollbarJSONFriendlyObject.h',
-                            'Rollbar/RollbarKSCrashReportSink.h',
-                            'Rollbar/RollbarKSCrashInstallation.h',
-                            'Rollbar/Deploys/RollbarDeploysProtocol.h',
-                            'Rollbar/Deploys/RollbarDeploysManager.h',
-                            'Rollbar/Deploys/DeployApiCallOutcome.h',
-                            'Rollbar/Deploys/Deployment.h',
-                            'Rollbar/Deploys/DeploymentDetails.h',
-                            'Rollbar/Deploys/DeployApiCallResult.h',
-                            'Rollbar/Deploys/RollbarDeploysDTOs.h',
+                            'Rollbar/Abstraction_Common/Persistent.h',
+                            'Rollbar/Abstraction_Common/JSONSupport.h',
+
+                            'Rollbar/Abstraction_DTO/RollbarDTOAbstraction.h',
+                            'Rollbar/Abstraction_DTO/DataTransferObject.h',
+                            'Rollbar/Abstraction_DTO/DataTransferObject+CustomData.h',
+
+                            'Rollbar/Abstraction_Deploys/RollbarDeploysProtocol.h',
+
+                            'Rollbar/Common/TriStateFlag.h',
+
+                            'Rollbar/Notifier/Rollbar.h',
+                            'Rollbar/Notifier/RollbarFacade.h',
+                            'Rollbar/Notifier/RollbarNotifier.h',
+                            'Rollbar/Notifier/RollbarConfiguration.h',
+                            'Rollbar/Notifier/RollbarTelemetry.h',
+                            'Rollbar/Notifier/RollbarLog.h',
+                            'Rollbar/Notifier/RollbarKSCrashReportSink.h',
+                            'Rollbar/Notifier/RollbarKSCrashInstallation.h',
+                            'Rollbar/Notifier/RollbarJSONFriendlyProtocol.h',
+                            'Rollbar/Notifier/RollbarJSONFriendlyObject.h',
+
+                            'Rollbar/Notifier_DTOs/RollbarPayloadDTOs.h',
+                            'Rollbar/Notifier_DTOs/RollbarLevel.h',
+                            'Rollbar/Notifier_DTOs/CaptureIpType.h',
+                            'Rollbar/Notifier_DTOs/HttpMethod.h',
+                            'Rollbar/Notifier_DTOs/RollbarAppLanguage.h',
+                            'Rollbar/Notifier_DTOs/RollbarSource.h',
+                            'Rollbar/Notifier_DTOs/RollbarPayload.h',
+                            'Rollbar/Notifier_DTOs/RollbarData.h',
+                            'Rollbar/Notifier_DTOs/RollbarBody.h',
+                            'Rollbar/Notifier_DTOs/RollbarMessage.h',
+                            'Rollbar/Notifier_DTOs/RollbarTrace.h',
+                            'Rollbar/Notifier_DTOs/RollbarCallStackFrame.h',
+                            'Rollbar/Notifier_DTOs/RollbarCallStackFrameContext.h',
+                            'Rollbar/Notifier_DTOs/RollbarException.h',
+                            'Rollbar/Notifier_DTOs/RollbarCrashReport.h',
+                            'Rollbar/Notifier_DTOs/RollbarConfig.h',
+                            'Rollbar/Notifier_DTOs/RollbarServerConfig.h',
+                            'Rollbar/Notifier_DTOs/RollbarDestination.h',
+                            'Rollbar/Notifier_DTOs/RollbarDeveloperOptions.h',
+                            'Rollbar/Notifier_DTOs/RollbarProxy.h',
+                            'Rollbar/Notifier_DTOs/RollbarScrubbingOptions.h',
+                            'Rollbar/Notifier_DTOs/RollbarRequest.h',
+                            'Rollbar/Notifier_DTOs/RollbarPerson.h',
+                            'Rollbar/Notifier_DTOs/RollbarModule.h',
+                            'Rollbar/Notifier_DTOs/RollbarTelemetryOptions.h',
+                            'Rollbar/Notifier_DTOs/RollbarLoggingOptions.h',
+                            'Rollbar/Notifier_DTOs/RollbarServer.h',
+                            'Rollbar/Notifier_DTOs/RollbarClient.h',
+                            'Rollbar/Notifier_DTOs/RollbarJavascript.h',
+                            'Rollbar/Notifier_DTOs/RollbarTelemetryType.h',
+                            'Rollbar/Notifier_DTOs/RollbarTelemetryEvent.h',
+
+                            'Rollbar/Notifier_DTOs/RollbarTelemetryBody.h',
+                            'Rollbar/Notifier_DTOs/RollbarTelemetryLogBody.h',
+                            'Rollbar/Notifier_DTOs/RollbarTelemetryViewBody.h',
+                            'Rollbar/Notifier_DTOs/RollbarTelemetryErrorBody.h',
+                            'Rollbar/Notifier_DTOs/RollbarTelemetryNavigationBody.h',
+                            'Rollbar/Notifier_DTOs/RollbarTelemetryNetworkBody.h',
+                            'Rollbar/Notifier_DTOs/RollbarTelemetryConnectivityBody.h',
+                            'Rollbar/Notifier_DTOs/RollbarTelemetryManualBody.h',
+
                             'Rollbar/Deploys/RollbarDeploys.h',
-                            'Rollbar/DTOs/JSONSupport.h',
-                            'Rollbar/DTOs/Persistent.h',
-                            'Rollbar/DTOs/DataTransferObject.h',
-                            'Rollbar/DTOs/DataTransferObject+CustomData.h',
-                            'Rollbar/DTOs/RollbarDTOAbstraction.h',
-                            'Rollbar/DTOs/RollbarLevel.h',
-                            'Rollbar/DTOs/TriStateFlag.h',
-                            'Rollbar/DTOs/CaptureIpType.h',
-                            'Rollbar/DTOs/HttpMethod.h',
-                            'Rollbar/DTOs/RollbarAppLanguage.h',
-                            'Rollbar/DTOs/RollbarPayload.h',
-                            'Rollbar/DTOs/RollbarData.h',
-                            'Rollbar/DTOs/RollbarBody.h',
-                            'Rollbar/DTOs/RollbarMessage.h',
-                            'Rollbar/DTOs/RollbarTrace.h',
-                            'Rollbar/DTOs/RollbarCallStackFrame.h',
-                            'Rollbar/DTOs/RollbarCallStackFrameContext.h',
-                            'Rollbar/DTOs/RollbarException.h',
-                            'Rollbar/DTOs/RollbarCrashReport.h',
-                            'Rollbar/DTOs/RollbarConfig.h',
-                            'Rollbar/DTOs/RollbarServerConfig.h',
-                            'Rollbar/DTOs/RollbarDestination.h',
-                            'Rollbar/DTOs/RollbarDeveloperOptions.h',
-                            'Rollbar/DTOs/RollbarProxy.h',
-                            'Rollbar/DTOs/RollbarScrubbingOptions.h',
-                            'Rollbar/DTOs/RollbarRequest.h',
-                            'Rollbar/DTOs/RollbarPerson.h',
-                            'Rollbar/DTOs/RollbarModule.h',
-                            'Rollbar/DTOs/RollbarTelemetryOptions.h',
-                            'Rollbar/DTOs/RollbarLoggingOptions.h',
-                            'Rollbar/DTOs/RollbarServer.h',
-                            'Rollbar/DTOs/RollbarClient.h',
-                            'Rollbar/DTOs/RollbarJavascript.h',
-                            'Rollbar/DTOs/RollbarPayloadDTOs.h',
+                            'Rollbar/Deploys/RollbarDeploysManager.h',
+
+                            'Rollbar/Deploys_DTOs/RollbarDeploysDTOs.h',
+                            'Rollbar/Deploys_DTOs/Deployment.h',
+                            'Rollbar/Deploys_DTOs/DeploymentDetails.h',
+                            'Rollbar/Deploys_DTOs/DeployApiCallResult.h',
+                            'Rollbar/Deploys_DTOs/DeployApiCallOutcome.h',
+
                             'KSCrash/Source/KSCrash/Recording/KSCrash.h',
                             'KSCrash/Source/KSCrash/Installations/KSCrashInstallation.h',
                             'KSCrash/Source/KSCrash/Installations/KSCrashInstallation+Private.h',