Skip to content

Commit

Permalink
Merge branch 'release/6.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
matus-tomlein committed Apr 3, 2024
2 parents 6b50e44 + ebbafb5 commit b87e249
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 14 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
Version 6.0.2 (2024-04-02)
--------------------------
Fix non-published constructor for MediaPlaybackRateChangeEvent (#884)
Remove deprecated name property in SPM package file for the Mocker dependency on Swift 5.9 (#881) thanks to @nvelichkin
Fix accessing media tracking instance not on internal queue (#886)
Expose a public getter for EmitterEvent's payload and storeId properties (#879)

Version 6.0.1 (2024-02-14)
--------------------------
Make EmitterEvent constructor public (#876)
Expand Down
2 changes: 1 addition & 1 deletion Examples
2 changes: 1 addition & 1 deletion [email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ let package = Package(
targets: ["SnowplowTracker"]),
],
dependencies: [
.package(name: "Mocker", url: "https://github.com/WeTransfer/Mocker.git", from: "2.5.4"),
.package(url: "https://github.com/WeTransfer/Mocker.git", from: "2.5.4"),
],
targets: [
.target(
Expand Down
2 changes: 1 addition & 1 deletion SnowplowTracker.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "SnowplowTracker"
s.version = "6.0.1"
s.version = "6.0.2"
s.summary = "Snowplow event tracker for iOS, macOS, tvOS, watchOS for apps and games."
s.description = <<-DESC
Snowplow is a mobile and event analytics platform with a difference: rather than tell our users how they should analyze their data, we deliver their event-level data in their own data warehouse, on their own Amazon Redshift or Postgres database, so they can analyze it any way they choose. Snowplow mobile is used by data-savvy games companies and app developers to better understand their users and how they engage with their games and applications. Snowplow is open source using the business-friendly Apache License, Version 2.0 and scales horizontally to many billions of events.
Expand Down
8 changes: 7 additions & 1 deletion Sources/Core/InternalQueue/MediaControllerIQWrapper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,13 @@ class MediaControllerIQWrapper: MediaController {
#endif

func mediaTracking(id: String) -> MediaTracking? {
return InternalQueue.sync { controller.mediaTracking(id: id) }
return InternalQueue.sync {
if let mediaTracking = controller.mediaTracking(id: id) {
return MediaTrackingIQWrapper(tracking: mediaTracking)
} else {
return nil
}
}
}

func endMediaTracking(id: String) {
Expand Down
2 changes: 1 addition & 1 deletion Sources/Core/TrackerConstants.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import Foundation

// --- Version
let kSPRawVersion = "6.0.1"
let kSPRawVersion = "6.0.2"
#if os(iOS)
let kSPVersion = "ios-\(kSPRawVersion)"
#elseif os(tvOS)
Expand Down
4 changes: 2 additions & 2 deletions Sources/Snowplow/Emitter/EmitterEvent.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import Foundation

@objc(SPEmitterEvent)
public class EmitterEvent: NSObject {
private(set) var payload: Payload
private(set) var storeId: Int64
public private(set) var payload: Payload
public private(set) var storeId: Int64

@objc
public init(payload: Payload, storeId: Int64) {
Expand Down
8 changes: 4 additions & 4 deletions Sources/Snowplow/Events/ScreenView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class ScreenView: SelfDescribingAbstract {
/// Name of the screen.
@objc
public var name: String
/// Identifier of the screen.
/// Identifier of the screen view (unique for each screen view event).
@objc
public var screenId: UUID
/// Type of screen.
Expand All @@ -44,7 +44,7 @@ public class ScreenView: SelfDescribingAbstract {
/// Name of the previous screen.
@objc
public var previousName: String?
/// Identifier of the previous screen.
/// Identifier of the previous screen view.
@objc
public var previousId: String?
/// Type of the previous screen.
Expand All @@ -62,7 +62,7 @@ public class ScreenView: SelfDescribingAbstract {

/// Creates a screenview event.
/// - Parameter name: Name of the screen.
/// - Parameter screenId: Identifier of the screen.
/// - Parameter screenId: Identifier of the screen view (unique for each screen view event).
@objc
public init(name: String, screenId: UUID? = nil) {
self.screenId = screenId ?? UUID()
Expand Down Expand Up @@ -115,7 +115,7 @@ public class ScreenView: SelfDescribingAbstract {
return self
}

/// Identifier of the previous screen.
/// Identifier of the previous screen view.
@objc
public func previousId(_ previousId: String?) -> Self {
self.previousId = previousId
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ public class MediaPlaybackRateChangeEvent: SelfDescribingAbstract, MediaPlayerUp

/// - Parameter previousRate: Playback rate before the change (1 is normal). If not set, it is taken from the last setting in media player.
/// - Parameter newRate: Playback rate after the change (1 is normal)
init(previousRate: Double? = nil, newRate: Double) {
public init(previousRate: Double? = nil, newRate: Double) {
self.previousRate = previousRate
self.newRate = newRate
}

/// - Parameter newRate: Playback rate after the change (1 is normal)
@objc
init(newRate: Double) {
public init(newRate: Double) {
self.newRate = newRate
}

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.0.1
6.0.2

0 comments on commit b87e249

Please sign in to comment.