Skip to content

Commit e353115

Browse files
committed
chore(ios): integrate kscrash to measure
1 parent c81027b commit e353115

File tree

13 files changed

+420
-299
lines changed

13 files changed

+420
-299
lines changed

Package.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ let package = Package(
1313
),
1414
],
1515
dependencies: [
16-
.package(url: "https://github.com/microsoft/plcrashreporter.git", from: "1.12.0")
16+
.package(url: "https://github.com/microsoft/plcrashreporter.git", from: "1.12.0"),
17+
.package(url: "https://github.com/kstenerud/KSCrash.git", from: "2.5.1")
1718
],
1819
targets: [
1920
.target(
2021
name: "Measure",
2122
dependencies: [
22-
.product(name: "CrashReporter", package: "plcrashreporter")
23+
.product(name: "CrashReporter", package: "plcrashreporter"),
24+
.product(name: "Recording", package: "KSCrash")
2325
],
2426
path: "ios/Sources/MeasureSDK/Swift",
2527
resources: [

ios/DemoApp/Podfile.lock

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,29 @@
11
PODS:
2+
- KSCrash (2.5.1):
3+
- KSCrash/Installations (= 2.5.1)
4+
- KSCrash/Core (2.5.1)
5+
- KSCrash/DemangleFilter (2.5.1):
6+
- KSCrash/Recording
7+
- KSCrash/Filters (2.5.1):
8+
- KSCrash/Recording
9+
- KSCrash/RecordingCore
10+
- KSCrash/ReportingCore
11+
- KSCrash/Installations (2.5.1):
12+
- KSCrash/DemangleFilter
13+
- KSCrash/Filters
14+
- KSCrash/Recording
15+
- KSCrash/Sinks
16+
- KSCrash/Recording (2.5.1):
17+
- KSCrash/RecordingCore
18+
- KSCrash/RecordingCore (2.5.1):
19+
- KSCrash/Core
20+
- KSCrash/ReportingCore (2.5.1):
21+
- KSCrash/Core
22+
- KSCrash/Sinks (2.5.1):
23+
- KSCrash/Filters
24+
- KSCrash/Recording
225
- measure-sh (0.9.1):
26+
- KSCrash (~> 2.5)
327
- PLCrashReporter (= 1.12.0)
428
- PLCrashReporter (1.12.0)
529

@@ -8,14 +32,16 @@ DEPENDENCIES:
832

933
SPEC REPOS:
1034
trunk:
35+
- KSCrash
1136
- PLCrashReporter
1237

1338
EXTERNAL SOURCES:
1439
measure-sh:
1540
:path: "../../"
1641

1742
SPEC CHECKSUMS:
18-
measure-sh: 34a0c21e3b908da77bc4cfc02f633413de11e32b
43+
KSCrash: 8c4464fd5da7de520f2ce4a00fdf63f169a80f18
44+
measure-sh: f7c35cf3138ac9861369f4e7b59437ab23b41728
1945
PLCrashReporter: db59ef96fa3d25f3650040d02ec2798cffee75f2
2046

2147
PODFILE CHECKSUM: 828d9701ce9dd588cdabe7bc1a8cb829d2a17f97

ios/DemoAppSwiftUI/DemoAppSwiftUI.xcodeproj/project.pbxproj

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
CF0F95502F58096B0018D95D /* Measure in Frameworks */ = {isa = PBXBuildFile; productRef = CF0F954F2F58096B0018D95D /* Measure */; };
1011
CF9234A62E5F3DF600815D9E /* Measure in Frameworks */ = {isa = PBXBuildFile; productRef = CF9234A52E5F3DF600815D9E /* Measure */; };
1112
/* End PBXBuildFile section */
1213

@@ -28,6 +29,7 @@
2829
buildActionMask = 2147483647;
2930
files = (
3031
CF9234A62E5F3DF600815D9E /* Measure in Frameworks */,
32+
CF0F95502F58096B0018D95D /* Measure in Frameworks */,
3133
);
3234
runOnlyForDeploymentPostprocessing = 0;
3335
};
@@ -79,6 +81,7 @@
7981
name = DemoAppSwiftUI;
8082
packageProductDependencies = (
8183
CF9234A52E5F3DF600815D9E /* Measure */,
84+
CF0F954F2F58096B0018D95D /* Measure */,
8285
);
8386
productName = DemoAppSwiftUI;
8487
productReference = CF9234962E5F3D8D00815D9E /* DemoAppSwiftUI.app */;
@@ -109,6 +112,7 @@
109112
mainGroup = CF92348D2E5F3D8D00815D9E;
110113
minimizedProjectReferenceProxies = 1;
111114
packageReferences = (
115+
CF0F954E2F58096B0018D95D /* XCLocalSwiftPackageReference "../../../measure" */,
112116
);
113117
preferredProjectObjectVersion = 77;
114118
productRefGroup = CF9234972E5F3D8D00815D9E /* Products */;
@@ -341,7 +345,18 @@
341345
};
342346
/* End XCConfigurationList section */
343347

348+
/* Begin XCLocalSwiftPackageReference section */
349+
CF0F954E2F58096B0018D95D /* XCLocalSwiftPackageReference "../../../measure" */ = {
350+
isa = XCLocalSwiftPackageReference;
351+
relativePath = ../../../measure;
352+
};
353+
/* End XCLocalSwiftPackageReference section */
354+
344355
/* Begin XCSwiftPackageProductDependency section */
356+
CF0F954F2F58096B0018D95D /* Measure */ = {
357+
isa = XCSwiftPackageProductDependency;
358+
productName = Measure;
359+
};
345360
CF9234A52E5F3DF600815D9E /* Measure */ = {
346361
isa = XCSwiftPackageProductDependency;
347362
productName = Measure;

ios/MeasureSDK.xcodeproj/project.pbxproj

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@
190190
CF041C432ED437F6004B4D28 /* SignalSampler.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF041C422ED437F6004B4D28 /* SignalSampler.swift */; };
191191
CF041C452ED46E7F004B4D28 /* MockSignalSampler.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF041C442ED46E7F004B4D28 /* MockSignalSampler.swift */; };
192192
CF041C462ED46E7F004B4D28 /* MockSignalSampler.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF041C442ED46E7F004B4D28 /* MockSignalSampler.swift */; };
193+
CF0F95782F5834450018D95D /* Recording in Frameworks */ = {isa = PBXBuildFile; productRef = CF0F95772F5834450018D95D /* Recording */; };
193194
CF11CCD82F1B996B00EF68E9 /* MockSignalStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF11CCD72F1B996B00EF68E9 /* MockSignalStore.swift */; };
194195
CF1200002D9BF5A000A3FCF7 /* AtomicBool.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF12FFFF2D9BF5A000A3FCF7 /* AtomicBool.swift */; };
195196
CF12A68E2E97A761001C8112 /* AttributeValueValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF12A68D2E97A761001C8112 /* AttributeValueValidator.swift */; };
@@ -651,6 +652,7 @@
651652
isa = PBXFrameworksBuildPhase;
652653
buildActionMask = 2147483647;
653654
files = (
655+
CF0F95782F5834450018D95D /* Recording in Frameworks */,
654656
523C1AC52C6B1B850081D1CC /* CrashReporter in Frameworks */,
655657
);
656658
runOnlyForDeploymentPostprocessing = 0;
@@ -1415,6 +1417,7 @@
14151417
name = Measure;
14161418
packageProductDependencies = (
14171419
523C1AC42C6B1B850081D1CC /* CrashReporter */,
1420+
CF0F95772F5834450018D95D /* Recording */,
14181421
);
14191422
productName = MeasureSDK;
14201423
productReference = 524CC5BA2C6A4B11001AB506 /* Measure.framework */;
@@ -1495,6 +1498,7 @@
14951498
mainGroup = 524CC5B02C6A4B11001AB506;
14961499
packageReferences = (
14971500
523C1AC32C6B1B850081D1CC /* XCRemoteSwiftPackageReference "plcrashreporter" */,
1501+
CF0F95762F5834450018D95D /* XCRemoteSwiftPackageReference "KSCrash" */,
14981502
);
14991503
productRefGroup = 524CC5BB2C6A4B11001AB506 /* Products */;
15001504
projectDirPath = "";
@@ -2409,6 +2413,14 @@
24092413
version = 1.12.0;
24102414
};
24112415
};
2416+
CF0F95762F5834450018D95D /* XCRemoteSwiftPackageReference "KSCrash" */ = {
2417+
isa = XCRemoteSwiftPackageReference;
2418+
repositoryURL = "https://github.com/kstenerud/KSCrash.git";
2419+
requirement = {
2420+
kind = exactVersion;
2421+
version = 2.5.1;
2422+
};
2423+
};
24122424
/* End XCRemoteSwiftPackageReference section */
24132425

24142426
/* Begin XCSwiftPackageProductDependency section */
@@ -2417,6 +2429,11 @@
24172429
package = 523C1AC32C6B1B850081D1CC /* XCRemoteSwiftPackageReference "plcrashreporter" */;
24182430
productName = CrashReporter;
24192431
};
2432+
CF0F95772F5834450018D95D /* Recording */ = {
2433+
isa = XCSwiftPackageProductDependency;
2434+
package = CF0F95762F5834450018D95D /* XCRemoteSwiftPackageReference "KSCrash" */;
2435+
productName = Recording;
2436+
};
24202437
/* End XCSwiftPackageProductDependency section */
24212438

24222439
/* Begin XCVersionGroup section */

ios/PublicApi/Measure.swiftinterface

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import AVKit
66
import CoreData
77
import CoreMotion
88
import CoreTelephony
9-
import CrashReporter
109
import Foundation
10+
import KSCrashRecording
1111
import MachO
1212
import Network
1313
import ObjectiveC

0 commit comments

Comments
 (0)