Skip to content

Commit 9789a2d

Browse files
authored
Merge pull request #162 from WideSpectrumComputing/master
Hot fixes
2 parents d5ceee9 + 18cdd12 commit 9789a2d

12 files changed

+75
-70
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ The change log has moved to this repo's [GitHub Releases Page](https://github.co
2525

2626
## Release Notes
2727

28+
### 2.2.4
29+
30+
- fix: resolve #161 - Fix type conversion within RollbarAulEntitySnapper.m
31+
- chore: resolve #109 - ARM64 slice excluded from cocoapods spec?
32+
2833
### 2.2.3
2934

3035
- fix: resolve #154 - Fix Cocoapods builds.

RollbarAUL.podspec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
Pod::Spec.new do |s|
99

10-
s.version = "2.2.3"
10+
s.version = "2.2.4"
1111
s.name = "RollbarAUL"
1212
s.summary = "Application or client side SDK for interacting with the Rollbar API Server."
1313
s.description = <<-DESC
@@ -61,10 +61,10 @@ Pod::Spec.new do |s|
6161
"HEADER_SEARCH_PATHS" => "$(PODS_ROOT)/#{s.name}/#{s.name}/Sources/#{s.name}/**"
6262
}
6363

64-
s.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" }
65-
s.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" }
64+
# s.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" }
65+
# s.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" }
6666

67-
s.tvos.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" }
68-
s.tvos.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" }
67+
# s.tvos.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" }
68+
# s.tvos.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" }
6969

7070
end

RollbarAUL/Sources/RollbarAUL/RollbarAulEntrySnapper.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ - (void)captureOSLogEntryActivity:(nullable OSLogEntryActivity *)entry
7474
return;
7575
}
7676

77-
snapshot[@"aul_parentActivityIdentifier"] = [NSNumber numberWithUnsignedInt:entry.parentActivityIdentifier];
77+
snapshot[@"aul_parentActivityIdentifier"] = [NSNumber numberWithUnsignedLongLong:entry.parentActivityIdentifier];
7878
}
7979

8080
- (void)captureOSLogEntrySignpost:(nullable OSLogEntrySignpost *)entry
@@ -84,7 +84,7 @@ - (void)captureOSLogEntrySignpost:(nullable OSLogEntrySignpost *)entry
8484
return;
8585
}
8686

87-
snapshot[@"aul_signpostIdentifier"] = [NSNumber numberWithUnsignedInt:entry.signpostIdentifier];
87+
snapshot[@"aul_signpostIdentifier"] = [NSNumber numberWithUnsignedLongLong:entry.signpostIdentifier];
8888
snapshot[@"aul_signpostName"] = entry.signpostName;
8989
snapshot[@"aul_signpostType"] = [NSNumber numberWithInteger:entry.signpostType];
9090
}
@@ -96,11 +96,11 @@ - (void)captureOSLogEntryFromProcess:(nullable OSLogEntry<OSLogEntryFromProcess>
9696
return;
9797
}
9898

99-
snapshot[@"aul_activityIdentifier"] = [NSNumber numberWithUnsignedInt:entry.activityIdentifier]; //uint64
99+
snapshot[@"aul_activityIdentifier"] = [NSNumber numberWithUnsignedLongLong:entry.activityIdentifier];
100100
snapshot[@"aul_process"] = entry.process;
101101
snapshot[@"aul_processIdentifier"] = [NSNumber numberWithInt:entry.processIdentifier];
102102
snapshot[@"aul_sender"] = entry.sender;
103-
snapshot[@"aul_threadIdentifier"] = [NSNumber numberWithUnsignedInt:entry.threadIdentifier];
103+
snapshot[@"aul_threadIdentifier"] = [NSNumber numberWithUnsignedLongLong:entry.threadIdentifier];
104104
}
105105

106106
- (void)captureOSLogEntryWithPayload:(nullable OSLogEntry<OSLogEntryWithPayload> *)entry

RollbarCocoaLumberjack.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
Pod::Spec.new do |s|
99

10-
s.version = "2.2.3"
10+
s.version = "2.2.4"
1111
s.name = "RollbarCocoaLumberjack"
1212
s.summary = "Application or client side SDK for interacting with the Rollbar API Server."
1313
s.description = <<-DESC

RollbarCommon.podspec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
Pod::Spec.new do |s|
99

10-
s.version = "2.2.3"
10+
s.version = "2.2.4"
1111
s.name = "RollbarCommon"
1212
s.summary = "Application or client side SDK for interacting with the Rollbar API Server."
1313
s.description = <<-DESC
@@ -59,10 +59,10 @@ Pod::Spec.new do |s|
5959
# "HEADER_SEARCH_PATHS" => "$(PODS_ROOT)/Sources/#{s.name}/**"
6060
# }
6161

62-
s.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" }
63-
s.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" }
62+
# s.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" }
63+
# s.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" }
6464

65-
s.tvos.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" }
66-
s.tvos.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" }
65+
# s.tvos.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" }
66+
# s.tvos.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" }
6767

6868
end

RollbarDeploys.podspec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
Pod::Spec.new do |s|
99

10-
s.version = "2.2.3"
10+
s.version = "2.2.4"
1111
s.name = "RollbarDeploys"
1212
s.summary = "Application or client side SDK for interacting with the Rollbar API Server."
1313
s.description = <<-DESC
@@ -60,10 +60,10 @@ Pod::Spec.new do |s|
6060
# "HEADER_SEARCH_PATHS" => "$(PODS_ROOT)/Sources/#{s.name}/**"
6161
# }
6262

63-
s.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" }
64-
s.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" }
63+
# s.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" }
64+
# s.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" }
6565

66-
s.tvos.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" }
67-
s.tvos.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" }
66+
# s.tvos.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" }
67+
# s.tvos.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" }
6868

6969
end

RollbarKSCrash.podspec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
Pod::Spec.new do |s|
99

10-
s.version = "2.2.3"
10+
s.version = "2.2.4"
1111
s.name = "RollbarKSCrash"
1212
s.summary = "Application or client side SDK for interacting with the Rollbar API Server."
1313
s.description = <<-DESC
@@ -61,10 +61,10 @@ Pod::Spec.new do |s|
6161
# "HEADER_SEARCH_PATHS" => "$(PODS_ROOT)/Sources/#{s.name}/**"
6262
# }
6363

64-
s.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" }
65-
s.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" }
64+
# s.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" }
65+
# s.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" }
6666

67-
s.tvos.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" }
68-
s.tvos.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" }
67+
# s.tvos.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" }
68+
# s.tvos.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" }
6969

7070
end

RollbarNotifier.podspec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
Pod::Spec.new do |s|
99

10-
s.version = "2.2.3"
10+
s.version = "2.2.4"
1111
s.name = "RollbarNotifier"
1212
s.summary = "Application or client side SDK for interacting with the Rollbar API Server."
1313
s.description = <<-DESC
@@ -60,10 +60,10 @@ Pod::Spec.new do |s|
6060
# "HEADER_SEARCH_PATHS" => "$(PODS_ROOT)/Sources/#{s.name}/**"
6161
# }
6262

63-
s.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" }
64-
s.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" }
63+
# s.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" }
64+
# s.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" }
6565

66-
s.tvos.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" }
67-
s.tvos.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" }
66+
# s.tvos.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" }
67+
# s.tvos.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" }
6868

6969
end

RollbarNotifier/Sources/RollbarNotifier/DTOs/RollbarConfig.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#pragma mark - constants
1616

17-
static NSString * const NOTIFIER_VERSION = @"2.2.3";
17+
static NSString * const NOTIFIER_VERSION = @"2.2.4";
1818

1919
static NSString * const NOTIFIER_NAME = @"rollbar-apple";
2020

RollbarPLCrashReporter.podspec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
Pod::Spec.new do |s|
99

10-
s.version = "2.2.3"
10+
s.version = "2.2.4"
1111
s.name = "RollbarPLCrashReporter"
1212
s.summary = "Application or client side SDK for interacting with the Rollbar API Server."
1313
s.description = <<-DESC
@@ -62,10 +62,10 @@ Pod::Spec.new do |s|
6262
# "HEADER_SEARCH_PATHS" => "$(PODS_ROOT)/Sources/#{s.name}/**"
6363
# }
6464

65-
s.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" }
66-
s.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" }
65+
# s.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" }
66+
# s.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "arm64" }
6767

68-
s.tvos.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" }
69-
s.tvos.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" }
68+
# s.tvos.pod_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" }
69+
# s.tvos.user_target_xcconfig = { "ONLY_ACTIVE_ARCH" => "YES", "EXCLUDED_ARCHS[sdk=appletvsimulator*]" => "arm64" }
7070

7171
end

0 commit comments

Comments
 (0)