Skip to content

Commit 318a549

Browse files
authored
fix(ios): correct misspelled lifecycle api names (#4153)
1 parent d0181bb commit 318a549

6 files changed

Lines changed: 45 additions & 31 deletions

File tree

frontend/dashboard/content/docs/navigation-tracking.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,13 @@ class CheckoutViewController: MsrViewController {
144144
}
145145
```
146146

147-
For SwiftUI, wrap a view in `MsrMoniterView` or use the `moniterWithMsr` extension to record `onAppear` and `onDisappear`:
147+
For SwiftUI, wrap a view in `MsrMonitorView` or use the `monitorWithMsr` extension to record `onAppear` and `onDisappear`:
148148

149149
```swift
150150
struct CheckoutView: View {
151151
var body: some View {
152152
CheckoutForm()
153-
.moniterWithMsr("Checkout")
153+
.monitorWithMsr("Checkout")
154154
}
155155
}
156156
```

ios/DemoApp/Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ PODS:
2222
- KSCrash/Sinks (2.5.1):
2323
- KSCrash/Filters
2424
- KSCrash/Recording
25-
- measure-sh (0.11.0):
25+
- measure-sh (0.12.1):
2626
- KSCrash (~> 2.5)
27-
- measure-sh/WebP (= 0.11.0)
28-
- measure-sh/WebP (0.11.0):
27+
- measure-sh/WebP (= 0.12.1)
28+
- measure-sh/WebP (0.12.1):
2929
- KSCrash (~> 2.5)
3030

3131
DEPENDENCIES:
@@ -41,7 +41,7 @@ EXTERNAL SOURCES:
4141

4242
SPEC CHECKSUMS:
4343
KSCrash: 8c4464fd5da7de520f2ce4a00fdf63f169a80f18
44-
measure-sh: 653622eb0cf3ca79dd81d1a6f541b26f8814d392
44+
measure-sh: 15d4312ca81891b387ba9133a1dddba8436a4801
4545

4646
PODFILE CHECKSUM: 828d9701ce9dd588cdabe7bc1a8cb829d2a17f97
4747

ios/MeasureSDK.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
526D18692D5A1913009A2E90 /* LifecycleEvents.swift in Sources */ = {isa = PBXBuildFile; fileRef = 526D17E82D5A1913009A2E90 /* LifecycleEvents.swift */; };
8484
526D186A2D5A1913009A2E90 /* LifecycleManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 526D17E92D5A1913009A2E90 /* LifecycleManager.swift */; };
8585
526D186B2D5A1913009A2E90 /* MsrViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 526D17EA2D5A1913009A2E90 /* MsrViewController.swift */; };
86-
526D186C2D5A1913009A2E90 /* MsrMoniterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 526D17EB2D5A1913009A2E90 /* MsrMoniterView.swift */; };
86+
526D186C2D5A1913009A2E90 /* MsrMonitorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 526D17EB2D5A1913009A2E90 /* MsrMonitorView.swift */; };
8787
526D186D2D5A1913009A2E90 /* NetworkChangeCallback.swift in Sources */ = {isa = PBXBuildFile; fileRef = 526D17ED2D5A1913009A2E90 /* NetworkChangeCallback.swift */; };
8888
526D186E2D5A1913009A2E90 /* NetworkChangeCollector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 526D17EE2D5A1913009A2E90 /* NetworkChangeCollector.swift */; };
8989
526D186F2D5A1913009A2E90 /* NetworkChangeData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 526D17EF2D5A1913009A2E90 /* NetworkChangeData.swift */; };
@@ -456,7 +456,7 @@
456456
526D17E82D5A1913009A2E90 /* LifecycleEvents.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LifecycleEvents.swift; sourceTree = "<group>"; };
457457
526D17E92D5A1913009A2E90 /* LifecycleManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LifecycleManager.swift; sourceTree = "<group>"; };
458458
526D17EA2D5A1913009A2E90 /* MsrViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MsrViewController.swift; sourceTree = "<group>"; };
459-
526D17EB2D5A1913009A2E90 /* MsrMoniterView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MsrMoniterView.swift; sourceTree = "<group>"; };
459+
526D17EB2D5A1913009A2E90 /* MsrMonitorView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MsrMonitorView.swift; sourceTree = "<group>"; };
460460
526D17ED2D5A1913009A2E90 /* NetworkChangeCallback.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkChangeCallback.swift; sourceTree = "<group>"; };
461461
526D17EE2D5A1913009A2E90 /* NetworkChangeCollector.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkChangeCollector.swift; sourceTree = "<group>"; };
462462
526D17EF2D5A1913009A2E90 /* NetworkChangeData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkChangeData.swift; sourceTree = "<group>"; };
@@ -945,7 +945,7 @@
945945
CF9D74C42E6169F3007D6D30 /* LifecycleManagerInternal.swift */,
946946
526D17E92D5A1913009A2E90 /* LifecycleManager.swift */,
947947
526D17EA2D5A1913009A2E90 /* MsrViewController.swift */,
948-
526D17EB2D5A1913009A2E90 /* MsrMoniterView.swift */,
948+
526D17EB2D5A1913009A2E90 /* MsrMonitorView.swift */,
949949
);
950950
path = Lifecycle;
951951
sourceTree = "<group>";
@@ -1857,7 +1857,7 @@
18571857
526D18452D5A1913009A2E90 /* Attachment.swift in Sources */,
18581858
CF893DDB2E950DEE00D99D45 /* EventOb+CoreDataProperties.swift in Sources */,
18591859
CF1BB5532DE4370A00588506 /* MsrDimensions.swift in Sources */,
1860-
526D186C2D5A1913009A2E90 /* MsrMoniterView.swift in Sources */,
1860+
526D186C2D5A1913009A2E90 /* MsrMonitorView.swift in Sources */,
18611861
526D183B2D5A1913009A2E90 /* CoreDataManager.swift in Sources */,
18621862
526D18832D5A1913009A2E90 /* IdProvider.swift in Sources */,
18631863
526D18652D5A1913009A2E90 /* URLSessionTaskSwizzler.swift in Sources */,

ios/PublicApi/Measure.swiftinterface

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// swift-interface-format-version: 1.0
2-
// swift-compiler-version: Apple Swift version 6.1.2 effective-5.10 (swiftlang-6.1.2.1.2 clang-1700.0.13.5)
3-
// swift-module-flags: -target arm64-apple-ios12-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -enable-experimental-feature DebugDescriptionMacro -enable-bare-slash-regex -module-name Measure
4-
// swift-module-flags-ignorable: -no-verify-emitted-module-interface -interface-compiler-version 6.1.2
2+
// swift-compiler-version: Apple Swift version 6.3.2 effective-5.10 (swiftlang-6.3.2.1.108 clang-2100.1.1.101)
3+
// swift-module-flags: -target arm64-apple-ios12-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -Onone -enable-experimental-feature DebugDescriptionMacro -enable-bare-slash-regex -module-name Measure
4+
// swift-module-flags-ignorable: -no-verify-emitted-module-interface -formal-cxx-interoperability-mode=off -interface-compiler-version 6.3.2
55
import AVKit
66
import CoreData
77
import CoreMotion
@@ -40,30 +40,30 @@ extension Measure.AttributeValue : Swift.Codable {
4040
public init(from decoder: any Swift.Decoder) throws
4141
}
4242
public typealias SessionObCoreDataClassSet = Foundation.NSSet
43-
@_inheritsConvenienceInitializers @objc(SessionOb) public class SessionOb : CoreData.NSManagedObject {
44-
@objc override dynamic public init(entity: CoreData.NSEntityDescription, insertInto context: CoreData.NSManagedObjectContext?)
43+
@_inheritsConvenienceInitializers @objc(SessionOb) nonisolated public class SessionOb : CoreData.NSManagedObject {
44+
@objc override nonisolated dynamic public init(entity: CoreData.NSEntityDescription, insertInto context: CoreData.NSManagedObjectContext?)
4545
@objc deinit
4646
}
4747
public typealias SessionObCoreDataPropertiesSet = Foundation.NSSet
4848
extension Measure.SessionOb {
4949
@nonobjc public class func fetchRequest() -> CoreData.NSFetchRequest<Measure.SessionOb>
50-
@objc @NSManaged dynamic public var crashed: Swift.Bool {
50+
@objc @NSManaged nonisolated dynamic public var crashed: Swift.Bool {
5151
@objc get
5252
@objc set
5353
}
54-
@objc @NSManaged dynamic public var createdAt: Swift.Int64 {
54+
@objc @NSManaged nonisolated dynamic public var createdAt: Swift.Int64 {
5555
@objc get
5656
@objc set
5757
}
58-
@objc @NSManaged dynamic public var needsReporting: Swift.Bool {
58+
@objc @NSManaged nonisolated dynamic public var needsReporting: Swift.Bool {
5959
@objc get
6060
@objc set
6161
}
62-
@objc @NSManaged dynamic public var pid: Swift.Int32 {
62+
@objc @NSManaged nonisolated dynamic public var pid: Swift.Int32 {
6363
@objc get
6464
@objc set
6565
}
66-
@objc @NSManaged dynamic public var sessionId: Swift.String? {
66+
@objc @NSManaged nonisolated dynamic public var sessionId: Swift.String? {
6767
@objc get
6868
@objc set
6969
}
@@ -324,16 +324,22 @@ public enum ScreenshotMaskLevel : Swift.String, Swift.Codable, Swift.CaseIterabl
324324
@objc deinit
325325
}
326326
@available(iOS 13, macOS 10.15, tvOS 13, watchOS 6.0, *)
327-
@_Concurrency.MainActor @preconcurrency public struct MsrMoniterView<Content> : SwiftUICore.View where Content : SwiftUICore.View {
327+
@_Concurrency.MainActor @preconcurrency public struct MsrMonitorView<Content> : SwiftUICore.View where Content : SwiftUICore.View {
328328
@_Concurrency.MainActor @preconcurrency public init(_ viewName: Swift.String? = nil, content: @escaping () -> Content)
329329
@_Concurrency.MainActor @preconcurrency public var body: some SwiftUICore.View {
330330
get
331331
}
332332
@available(iOS 13, tvOS 13, watchOS 6.0, macOS 10.15, *)
333-
public typealias Body = @_opaqueReturnTypeOf("$s7Measure14MsrMoniterViewV4bodyQrvp", 0) __<Content>
333+
public typealias Body = @_opaqueReturnTypeOf("$s7Measure14MsrMonitorViewV4bodyQrvp", 0) __<Content>
334334
}
335335
@available(iOS 13, macOS 10.15, tvOS 13, watchOS 6.0, *)
336+
@available(*, deprecated, renamed: "MsrMonitorView")
337+
public typealias MsrMoniterView<Content> = Measure.MsrMonitorView<Content> where Content : SwiftUICore.View
338+
@available(iOS 13, macOS 10.15, tvOS 13, watchOS 6.0, *)
336339
extension SwiftUICore.View {
340+
@_Concurrency.MainActor @preconcurrency public func monitorWithMsr(_ viewName: Swift.String? = nil) -> some SwiftUICore.View
341+
342+
@available(*, deprecated, renamed: "monitorWithMsr(_:)")
337343
@_Concurrency.MainActor @preconcurrency public func moniterWithMsr(_ viewName: Swift.String? = nil) -> some SwiftUICore.View
338344

339345
}
@@ -441,7 +447,7 @@ extension Measure.VCLifecycleEventType : Swift.Equatable {}
441447
extension Measure.VCLifecycleEventType : Swift.Hashable {}
442448
extension Measure.VCLifecycleEventType : Swift.RawRepresentable {}
443449
@available(iOS 13, macOS 10.15, tvOS 13, watchOS 6.0, *)
444-
extension Measure.MsrMoniterView : Swift.Sendable {}
450+
extension Measure.MsrMonitorView : Swift.Sendable {}
445451
extension Measure.LogSeverity : Swift.Equatable {}
446452
extension Measure.LogSeverity : Swift.Hashable {}
447453
extension Measure.LogSeverity : Swift.RawRepresentable {}

ios/Sources/MeasureSDK/Swift/Lifecycle/MsrMoniterView.swift renamed to ios/Sources/MeasureSDK/Swift/Lifecycle/MsrMonitorView.swift

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// MsrMoniterView.swift
2+
// MsrMonitorView.swift
33
// MeasureSDK
44
//
55
// Created by Adwin Ross on 29/10/24.
@@ -13,14 +13,14 @@ import SwiftUI
1313
/// ```swift
1414
/// struct ContentView: View {
1515
/// var body: some View {
16-
/// MsrMoniterView("ContentView") {
16+
/// MsrMonitorView("ContentView") {
1717
/// Text("Hello, World!")
1818
/// }
1919
/// }
2020
/// }
2121
/// ```
2222
@available(iOS 13, macOS 10.15, tvOS 13, watchOS 6.0, *)
23-
public struct MsrMoniterView<Content: View>: View {
23+
public struct MsrMonitorView<Content: View>: View {
2424
@State private var hasViewAppeared = false
2525

2626
let content: () -> Content
@@ -46,21 +46,30 @@ public struct MsrMoniterView<Content: View>: View {
4646
}
4747
}
4848

49+
@available(iOS 13, macOS 10.15, tvOS 13, watchOS 6.0, *)
50+
@available(*, deprecated, renamed: "MsrMonitorView")
51+
public typealias MsrMoniterView<Content: View> = MsrMonitorView<Content>
52+
4953
@available(iOS 13, macOS 10.15, tvOS 13, watchOS 6.0, *)
5054
public extension View {
51-
/// An extension function on View that wraps the view in an MsrMoniterView to monitor its lifecycle events.
55+
/// An extension function on View that wraps the view in an MsrMonitorView to monitor its lifecycle events.
5256
/// - Parameter viewName: viewName: An optional String representing the name of the view to be monitored. If nil, it defaults to the type name of the view itself.
5357
/// - Returns: some View
5458
/// ```swift
5559
/// struct ContentView: View {
5660
/// var body: some View {
5761
/// Text("Hello, World!")
58-
/// .moniterWithMsr("ContentView")
62+
/// .monitorWithMsr("ContentView")
5963
/// }
6064
/// }
61-
func moniterWithMsr(_ viewName: String? = nil) -> some View {
62-
return MsrMoniterView(viewName) {
65+
func monitorWithMsr(_ viewName: String? = nil) -> some View {
66+
return MsrMonitorView(viewName) {
6367
return self
6468
}
6569
}
70+
71+
@available(*, deprecated, renamed: "monitorWithMsr(_:)")
72+
func moniterWithMsr(_ viewName: String? = nil) -> some View {
73+
return monitorWithMsr(viewName)
74+
}
6675
}

ios/Tests/MeasureSDKTests/Exporter/EventSerializerTests.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,6 @@ final class EventSerializerTests: XCTestCase { // swiftlint:disable:this type_bo
465465
XCTAssertEqual(attributesDict?["device_locale"] as? String, attributes.deviceLocale)
466466
XCTAssertEqual(attributesDict?["os_name"] as? String, attributes.osName)
467467
XCTAssertEqual(attributesDict?["os_version"] as? String, attributes.osVersion)
468-
XCTAssertNil(attributesDict?["platform"])
469468
XCTAssertEqual(attributesDict?["network_type"] as? String, attributes.networkType?.rawValue)
470469
XCTAssertEqual(attributesDict?["network_generation"] as? String, attributes.networkGeneration?.rawValue)
471470
XCTAssertEqual(attributesDict?["network_provider"] as? String, attributes.networkProvider)

0 commit comments

Comments
 (0)