Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into philprime/file-io-tra…
Browse files Browse the repository at this point in the history
…cking-fix
  • Loading branch information
philprime committed Jan 13, 2025
2 parents e6cf6f0 + e2484ac commit c856d5a
Show file tree
Hide file tree
Showing 12 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/last-release-runid
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12584459349
12709879191
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## Unreleased
## 8.43.1-beta.0

### Fixes

Expand Down
8 changes: 4 additions & 4 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ let package = Package(
targets: [
.binaryTarget(
name: "Sentry",
url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.43.0/Sentry.xcframework.zip",
checksum: "18b16b651630b865a91d6cf527ef79363156386e3e8568ae15d5d8718267d535" //Sentry-Static
url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.43.1-beta.0/Sentry.xcframework.zip",
checksum: "abc3ceb746f5acf3edb05410fbe7965adbe5114af55a5ae6397426da68aae134" //Sentry-Static
),
.binaryTarget(
name: "Sentry-Dynamic",
url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.43.0/Sentry-Dynamic.xcframework.zip",
checksum: "8da7680ad34c360503bc0d91ee4a8a690c44100066d913c601cd701a97e21c94" //Sentry-Dynamic
url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.43.1-beta.0/Sentry-Dynamic.xcframework.zip",
checksum: "5b813de64be17d0c1576d6495a15b863e0e14dd631e07dcbd564f3f2825570d6" //Sentry-Dynamic
),
.target ( name: "SentrySwiftUI",
dependencies: ["Sentry", "SentryInternal"],
Expand Down
2 changes: 1 addition & 1 deletion Samples/iOS-Swift/iOS-Swift/Sample.xcconfig
Original file line number Diff line number Diff line change
@@ -1 +1 @@
MARKETING_VERSION = 8.43.0
MARKETING_VERSION = 8.43.1
2 changes: 1 addition & 1 deletion Sentry.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Sentry"
s.version = "8.43.0"
s.version = "8.43.1-beta.0"
s.summary = "Sentry client for cocoa"
s.homepage = "https://github.com/getsentry/sentry-cocoa"
s.license = "mit"
Expand Down
2 changes: 1 addition & 1 deletion SentryPrivate.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "SentryPrivate"
s.version = "8.43.0"
s.version = "8.43.1-beta.0"
s.summary = "Sentry Private Library."
s.homepage = "https://github.com/getsentry/sentry-cocoa"
s.license = "mit"
Expand Down
4 changes: 2 additions & 2 deletions SentrySwiftUI.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "SentrySwiftUI"
s.version = "8.43.0"
s.version = "8.43.1-beta.0"
s.summary = "Sentry client for SwiftUI"
s.homepage = "https://github.com/getsentry/sentry-cocoa"
s.license = "mit"
Expand All @@ -19,5 +19,5 @@ Pod::Spec.new do |s|
s.watchos.framework = 'WatchKit'

s.source_files = "Sources/SentrySwiftUI/**/*.{swift,h,m}"
s.dependency 'Sentry', "8.43.0"
s.dependency 'Sentry', "8.43.1-beta.0"
end
2 changes: 1 addition & 1 deletion Sources/Configuration/SDK.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ DYLIB_INSTALL_NAME_BASE = @rpath
MACH_O_TYPE = mh_dylib
FRAMEWORK_VERSION = A

CURRENT_PROJECT_VERSION = 8.43.0
CURRENT_PROJECT_VERSION = 8.43.1

ALWAYS_SEARCH_USER_PATHS = NO
CLANG_ENABLE_OBJC_ARC = YES
Expand Down
2 changes: 1 addition & 1 deletion Sources/Configuration/SentrySwiftUI.xcconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PRODUCT_NAME = SentrySwiftUI
CURRENT_PROJECT_VERSION = 8.43.0
CURRENT_PROJECT_VERSION = 8.43.1

MACOSX_DEPLOYMENT_TARGET = 10.15
IPHONEOS_DEPLOYMENT_TARGET = 13.0
Expand Down
2 changes: 1 addition & 1 deletion Sources/Sentry/SentryMeta.m
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ @implementation SentryMeta
// Don't remove the static keyword. If you do the compiler adds the constant name to the global
// symbol table and it might clash with other constants. When keeping the static keyword the
// compiler replaces all occurrences with the value.
static NSString *versionString = @"8.43.0";
static NSString *versionString = @"8.43.1-beta.0";
static NSString *sdkName = @"sentry.cocoa";

+ (NSString *)versionString
Expand Down
2 changes: 1 addition & 1 deletion Tests/HybridSDKTest/HybridPod.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ Pod::Spec.new do |s|
s.requires_arc = true
s.frameworks = 'Foundation'
s.swift_versions = "5.5"
s.dependency "Sentry/HybridSDK", "8.43.0"
s.dependency "Sentry/HybridSDK", "8.43.1-beta.0"
s.source_files = "HybridTest.swift"
end
2 changes: 1 addition & 1 deletion scripts/xcode-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,6 @@ if [ $RUN_TEST_WITHOUT_BUILDING == true ]; then
-destination "$DESTINATION" \
test-without-building 2>&1 |
tee raw-test-output.log |
xcbeautify &&
xcbeautify --quieter --renderer github-actions &&
slather coverage --configuration "$CONFIGURATION"
fi

0 comments on commit c856d5a

Please sign in to comment.