From b55ac39dedac9b21b19e7e5a2c2262d8001a6c0e Mon Sep 17 00:00:00 2001 From: Daniel Griesser Date: Wed, 8 Feb 2017 09:26:37 +0100 Subject: [PATCH] Bump version to 2.1.0 --- .gitignore | 1 + Examples/MacExample/Podfile.lock | 4 ++-- Examples/ObjCExample/Podfile.lock | 4 ++-- Examples/SwiftExample/Podfile.lock | 4 ++-- Examples/SwiftTVOSExample/Podfile.lock | 4 ++-- Examples/SwiftWatchOSExample/Podfile.lock | 4 ++-- Sentry.podspec | 2 +- Sentry/Info.plist | 2 +- Sources/CrashReportConverter.swift | 16 +++++++++------- Sources/Sentry.swift | 2 +- docs/sentry-doc-config.json | 2 +- 11 files changed, 24 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 63ab6ad67fb..a876f17c2c5 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ fastlane/test_output/ report.xml .env cobertura.xml +Sentry.framework.zip diff --git a/Examples/MacExample/Podfile.lock b/Examples/MacExample/Podfile.lock index 429c4c02047..c8916e3b85c 100644 --- a/Examples/MacExample/Podfile.lock +++ b/Examples/MacExample/Podfile.lock @@ -62,7 +62,7 @@ PODS: - KSCrash/Reporting/Tools - KSCrash/Reporting/Tools (1.15.3): - KSCrash/Recording - - Sentry (2.0.1): + - Sentry (2.1.0): - KSCrash (~> 1.15.3) DEPENDENCIES: @@ -74,7 +74,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: KSCrash: f344875321256d5906569a0853d73c6354a9f6f4 - Sentry: 447d675677c799ffce95f604a59d9b7c55ac8fc3 + Sentry: f488b86ef5004d448bccc7e85ab0ad1c6062942d PODFILE CHECKSUM: 9a6feca63fe6ed3706b2808f4c85dae0861ba9d2 diff --git a/Examples/ObjCExample/Podfile.lock b/Examples/ObjCExample/Podfile.lock index 999cf3239bd..e4aea73daeb 100644 --- a/Examples/ObjCExample/Podfile.lock +++ b/Examples/ObjCExample/Podfile.lock @@ -62,7 +62,7 @@ PODS: - KSCrash/Reporting/Tools - KSCrash/Reporting/Tools (1.15.3): - KSCrash/Recording - - Sentry (2.0.1): + - Sentry (2.1.0): - KSCrash (~> 1.15.3) DEPENDENCIES: @@ -74,7 +74,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: KSCrash: f344875321256d5906569a0853d73c6354a9f6f4 - Sentry: 447d675677c799ffce95f604a59d9b7c55ac8fc3 + Sentry: f488b86ef5004d448bccc7e85ab0ad1c6062942d PODFILE CHECKSUM: 6e920273a2258e01d891dd3561ac2a73612fe34a diff --git a/Examples/SwiftExample/Podfile.lock b/Examples/SwiftExample/Podfile.lock index 2574e69d3fb..6ba5c8b2e68 100644 --- a/Examples/SwiftExample/Podfile.lock +++ b/Examples/SwiftExample/Podfile.lock @@ -62,7 +62,7 @@ PODS: - KSCrash/Reporting/Tools - KSCrash/Reporting/Tools (1.15.3): - KSCrash/Recording - - Sentry (2.0.1): + - Sentry (2.1.0): - KSCrash (~> 1.15.3) DEPENDENCIES: @@ -74,7 +74,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: KSCrash: f344875321256d5906569a0853d73c6354a9f6f4 - Sentry: 447d675677c799ffce95f604a59d9b7c55ac8fc3 + Sentry: f488b86ef5004d448bccc7e85ab0ad1c6062942d PODFILE CHECKSUM: 699517be0d67a415d70bbce5f2d55f918605fcbc diff --git a/Examples/SwiftTVOSExample/Podfile.lock b/Examples/SwiftTVOSExample/Podfile.lock index 41434688c07..4a421cf32bb 100644 --- a/Examples/SwiftTVOSExample/Podfile.lock +++ b/Examples/SwiftTVOSExample/Podfile.lock @@ -62,7 +62,7 @@ PODS: - KSCrash/Reporting/Tools - KSCrash/Reporting/Tools (1.15.3): - KSCrash/Recording - - Sentry (2.0.1): + - Sentry (2.1.0): - KSCrash (~> 1.15.3) DEPENDENCIES: @@ -74,7 +74,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: KSCrash: f344875321256d5906569a0853d73c6354a9f6f4 - Sentry: 447d675677c799ffce95f604a59d9b7c55ac8fc3 + Sentry: f488b86ef5004d448bccc7e85ab0ad1c6062942d PODFILE CHECKSUM: 6a149bade470704ba4317901492b58978f603305 diff --git a/Examples/SwiftWatchOSExample/Podfile.lock b/Examples/SwiftWatchOSExample/Podfile.lock index fec5641fd51..915427a4b0f 100644 --- a/Examples/SwiftWatchOSExample/Podfile.lock +++ b/Examples/SwiftWatchOSExample/Podfile.lock @@ -62,7 +62,7 @@ PODS: - KSCrash/Reporting/Tools - KSCrash/Reporting/Tools (1.15.3): - KSCrash/Recording - - Sentry (2.0.1): + - Sentry (2.1.0): - KSCrash (~> 1.15.3) DEPENDENCIES: @@ -74,7 +74,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: KSCrash: f344875321256d5906569a0853d73c6354a9f6f4 - Sentry: 447d675677c799ffce95f604a59d9b7c55ac8fc3 + Sentry: f488b86ef5004d448bccc7e85ab0ad1c6062942d PODFILE CHECKSUM: c9a2358b4bf5bf7e6f601eb701b288f4e4bd724a diff --git a/Sentry.podspec b/Sentry.podspec index e65edf8fc5f..595d281c218 100644 --- a/Sentry.podspec +++ b/Sentry.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Sentry" - s.version = "2.0.1" + s.version = "2.1.0" s.summary = "Swift client for Sentry" s.homepage = "https://github.com/getsentry/sentry-swift" s.license = "mit" diff --git a/Sentry/Info.plist b/Sentry/Info.plist index 783e22ec8a1..dca568ec064 100644 --- a/Sentry/Info.plist +++ b/Sentry/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.0.1 + 2.1.0 CFBundleSignature ???? CFBundleVersion diff --git a/Sources/CrashReportConverter.swift b/Sources/CrashReportConverter.swift index 07b16c39d06..66307e73e45 100644 --- a/Sources/CrashReportConverter.swift +++ b/Sources/CrashReportConverter.swift @@ -17,14 +17,18 @@ internal final class CrashReportConverter { releaseVersion: String?, buildNumber: String?) - internal static func convertReportToEvent(_ report: CrashDictionary) -> Event? { - Log.Verbose.log("KSCrash Report = \(report)") - - var crashReport = report + private static func checkIncompleteReport(_ report: CrashDictionary) -> CrashDictionary { if let reCrash = report["recrash_report"] as? CrashDictionary { - crashReport = reCrash Log.Debug.log("Found incomplete crash, falling back to recrash_report - Possible not showing all thread information") + return reCrash } + return report + } + + internal static func convertReportToEvent(_ report: CrashDictionary) -> Event? { + Log.Verbose.log("KSCrash Report = \(report)") + + var crashReport = checkIncompleteReport(report) // Extract crash timestamp let timestamp: NSDate = { @@ -60,9 +64,7 @@ internal final class CrashReportConverter { } let binaryImages = binaryImagesDicts.flatMap({ BinaryImage(appleCrashBinaryImagesDict: $0) }) - let debugMeta = DebugMeta(binaryImages: binaryImages) - var threads = threadDicts.flatMap({ Thread(appleCrashThreadDict: $0, binaryImages: binaryImages) }) let exception = Exception(appleCrashErrorDict: errorDict, userInfo: userInfo) diff --git a/Sources/Sentry.swift b/Sources/Sentry.swift index ed2a7c189cc..04637dbadc8 100644 --- a/Sources/Sentry.swift +++ b/Sources/Sentry.swift @@ -46,7 +46,7 @@ import KSCrash // MARK: - Enums internal struct Info { - static let version: String = "2.0.1" + static let version: String = "2.1.0" static let sentryVersion: Int = 7 } diff --git a/docs/sentry-doc-config.json b/docs/sentry-doc-config.json index 10a65b51bd9..20917e91b0e 100644 --- a/docs/sentry-doc-config.json +++ b/docs/sentry-doc-config.json @@ -14,6 +14,6 @@ } }, "vars": { - "SENTRY_SWIFT_TAG": "2.0.1" + "SENTRY_SWIFT_TAG": "2.1.0" } }