Skip to content

chore(ios): integrate kscrash to measure #3255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
adwinross wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

chore(ios): integrate kscrash to measure #3255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/microsoft/plcrashreporter.git", from: "1.12.0")
.package(url: "https://github.com/microsoft/plcrashreporter.git", from: "1.12.0"),
.package(url: "https://github.com/kstenerud/KSCrash.git", from: "2.5.1")
],
targets: [
.target(
name: "Measure",
dependencies: [
.product(name: "CrashReporter", package: "plcrashreporter")
.product(name: "CrashReporter", package: "plcrashreporter"),
.product(name: "Recording", package: "KSCrash")
],
path: "ios/Sources/MeasureSDK/Swift",
resources: [
Expand Down
28 changes: 27 additions & 1 deletion ios/DemoApp/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
PODS:
- KSCrash (2.5.1):
- KSCrash/Installations (= 2.5.1)
- KSCrash/Core (2.5.1)
- KSCrash/DemangleFilter (2.5.1):
- KSCrash/Recording
- KSCrash/Filters (2.5.1):
- KSCrash/Recording
- KSCrash/RecordingCore
- KSCrash/ReportingCore
- KSCrash/Installations (2.5.1):
- KSCrash/DemangleFilter
- KSCrash/Filters
- KSCrash/Recording
- KSCrash/Sinks
- KSCrash/Recording (2.5.1):
- KSCrash/RecordingCore
- KSCrash/RecordingCore (2.5.1):
- KSCrash/Core
- KSCrash/ReportingCore (2.5.1):
- KSCrash/Core
- KSCrash/Sinks (2.5.1):
- KSCrash/Filters
- KSCrash/Recording
- measure-sh (0.9.1):
- KSCrash (~> 2.5)
- PLCrashReporter (= 1.12.0)
- PLCrashReporter (1.12.0)

Expand All @@ -8,14 +32,16 @@ DEPENDENCIES:

SPEC REPOS:
trunk:
- KSCrash
- PLCrashReporter

EXTERNAL SOURCES:
measure-sh:
:path: "../../"

SPEC CHECKSUMS:
measure-sh: 34a0c21e3b908da77bc4cfc02f633413de11e32b
KSCrash: 8c4464fd5da7de520f2ce4a00fdf63f169a80f18
measure-sh: f7c35cf3138ac9861369f4e7b59437ab23b41728
PLCrashReporter: db59ef96fa3d25f3650040d02ec2798cffee75f2

PODFILE CHECKSUM: 828d9701ce9dd588cdabe7bc1a8cb829d2a17f97
Expand Down
15 changes: 15 additions & 0 deletions ios/DemoAppSwiftUI/DemoAppSwiftUI.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
CF0F95502F58096B0018D95D /* Measure in Frameworks */ = {isa = PBXBuildFile; productRef = CF0F954F2F58096B0018D95D /* Measure */; };
CF9234A62E5F3DF600815D9E /* Measure in Frameworks */ = {isa = PBXBuildFile; productRef = CF9234A52E5F3DF600815D9E /* Measure */; };
/* End PBXBuildFile section */

Expand All @@ -28,6 +29,7 @@
buildActionMask = 2147483647;
files = (
CF9234A62E5F3DF600815D9E /* Measure in Frameworks */,
CF0F95502F58096B0018D95D /* Measure in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -79,6 +81,7 @@
name = DemoAppSwiftUI;
packageProductDependencies = (
CF9234A52E5F3DF600815D9E /* Measure */,
CF0F954F2F58096B0018D95D /* Measure */,
);
productName = DemoAppSwiftUI;
productReference = CF9234962E5F3D8D00815D9E /* DemoAppSwiftUI.app */;
Expand Down Expand Up @@ -109,6 +112,7 @@
mainGroup = CF92348D2E5F3D8D00815D9E;
minimizedProjectReferenceProxies = 1;
packageReferences = (
CF0F954E2F58096B0018D95D /* XCLocalSwiftPackageReference "../../../measure" */,
);
preferredProjectObjectVersion = 77;
productRefGroup = CF9234972E5F3D8D00815D9E /* Products */;
Expand Down Expand Up @@ -341,7 +345,18 @@
};
/* End XCConfigurationList section */

/* Begin XCLocalSwiftPackageReference section */
CF0F954E2F58096B0018D95D /* XCLocalSwiftPackageReference "../../../measure" */ = {
isa = XCLocalSwiftPackageReference;
relativePath = ../../../measure;
};
/* End XCLocalSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
CF0F954F2F58096B0018D95D /* Measure */ = {
isa = XCSwiftPackageProductDependency;
productName = Measure;
};
CF9234A52E5F3DF600815D9E /* Measure */ = {
isa = XCSwiftPackageProductDependency;
productName = Measure;
Expand Down
17 changes: 17 additions & 0 deletions ios/MeasureSDK.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@
CF041C432ED437F6004B4D28 /* SignalSampler.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF041C422ED437F6004B4D28 /* SignalSampler.swift */; };
CF041C452ED46E7F004B4D28 /* MockSignalSampler.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF041C442ED46E7F004B4D28 /* MockSignalSampler.swift */; };
CF041C462ED46E7F004B4D28 /* MockSignalSampler.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF041C442ED46E7F004B4D28 /* MockSignalSampler.swift */; };
CF0F95782F5834450018D95D /* Recording in Frameworks */ = {isa = PBXBuildFile; productRef = CF0F95772F5834450018D95D /* Recording */; };
CF11CCD82F1B996B00EF68E9 /* MockSignalStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF11CCD72F1B996B00EF68E9 /* MockSignalStore.swift */; };
CF1200002D9BF5A000A3FCF7 /* AtomicBool.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF12FFFF2D9BF5A000A3FCF7 /* AtomicBool.swift */; };
CF12A68E2E97A761001C8112 /* AttributeValueValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF12A68D2E97A761001C8112 /* AttributeValueValidator.swift */; };
Expand Down Expand Up @@ -651,6 +652,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
CF0F95782F5834450018D95D /* Recording in Frameworks */,
523C1AC52C6B1B850081D1CC /* CrashReporter in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -1415,6 +1417,7 @@
name = Measure;
packageProductDependencies = (
523C1AC42C6B1B850081D1CC /* CrashReporter */,
CF0F95772F5834450018D95D /* Recording */,
);
productName = MeasureSDK;
productReference = 524CC5BA2C6A4B11001AB506 /* Measure.framework */;
Expand Down Expand Up @@ -1495,6 +1498,7 @@
mainGroup = 524CC5B02C6A4B11001AB506;
packageReferences = (
523C1AC32C6B1B850081D1CC /* XCRemoteSwiftPackageReference "plcrashreporter" */,
CF0F95762F5834450018D95D /* XCRemoteSwiftPackageReference "KSCrash" */,
);
productRefGroup = 524CC5BB2C6A4B11001AB506 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -2409,6 +2413,14 @@
version = 1.12.0;
};
};
CF0F95762F5834450018D95D /* XCRemoteSwiftPackageReference "KSCrash" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/kstenerud/KSCrash.git";
requirement = {
kind = exactVersion;
version = 2.5.1;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
Expand All @@ -2417,6 +2429,11 @@
package = 523C1AC32C6B1B850081D1CC /* XCRemoteSwiftPackageReference "plcrashreporter" */;
productName = CrashReporter;
};
CF0F95772F5834450018D95D /* Recording */ = {
isa = XCSwiftPackageProductDependency;
package = CF0F95762F5834450018D95D /* XCRemoteSwiftPackageReference "KSCrash" */;
productName = Recording;
};
/* End XCSwiftPackageProductDependency section */

/* Begin XCVersionGroup section */
Expand Down
2 changes: 1 addition & 1 deletion ios/PublicApi/Measure.swiftinterface
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import AVKit
import CoreData
import CoreMotion
import CoreTelephony
import CrashReporter
import Foundation
import KSCrashRecording
import MachO
import Network
import ObjectiveC
Expand Down
Loading
Loading