Skip to content

Commit

Permalink
Update Analytics.swift
Browse files Browse the repository at this point in the history
remove merge conflict label
  • Loading branch information
alanjcharles authored Feb 27, 2024
1 parent e05a5ac commit 6d3f4c2
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions Sources/Segment/Analytics.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,8 @@ public class Analytics {

static internal let deadInstance = "DEADINSTANCE"
static internal weak var firstInstance: Analytics? = nil
<<<<<<< HEAD

=======
@Atomic static internal var activeWriteKeys = [String]()

>>>>>>> main
/**
This method isn't a traditional singleton implementation. It's provided here
to ease migration from analytics-ios to analytics-swift. Rather than return a
Expand Down Expand Up @@ -84,15 +80,11 @@ public class Analytics {
// Get everything running
platformStartup()
}
<<<<<<< HEAD

=======

deinit {
Self.removeActiveWriteKey(configuration.values.writeKey)
}

>>>>>>> main
internal func process<E: RawEvent>(incomingEvent: E) {
guard enabled == true else { return }
let event = incomingEvent.applyRawEventData(store: store)
Expand Down Expand Up @@ -447,11 +439,7 @@ extension Analytics {
Self.firstInstance = self
}
}
<<<<<<< HEAD

=======

>>>>>>> main
/// Determines if an instance is dead.
internal var isDead: Bool {
return configuration.values.writeKey == Self.deadInstance
Expand Down

0 comments on commit 6d3f4c2

Please sign in to comment.