From ca10683501ddc226487085f90774dd7acdcf820a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matu=CC=81s=CC=8C=20Tomlein?= Date: Fri, 29 Mar 2024 12:15:05 +0100 Subject: [PATCH 1/5] Fix non-published constructor for MediaPlaybackRateChangeEvent (close #884) --- .../Snowplow/Media/Events/MediaPlaybackRateChangeEvent.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/Snowplow/Media/Events/MediaPlaybackRateChangeEvent.swift b/Sources/Snowplow/Media/Events/MediaPlaybackRateChangeEvent.swift index 86b8d2792..da40e527d 100644 --- a/Sources/Snowplow/Media/Events/MediaPlaybackRateChangeEvent.swift +++ b/Sources/Snowplow/Media/Events/MediaPlaybackRateChangeEvent.swift @@ -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 } From 7d951da380257af2d482c731d13158d69c8dc1d8 Mon Sep 17 00:00:00 2001 From: Nikita Velichkin Date: Fri, 29 Mar 2024 12:19:31 +0100 Subject: [PATCH 2/5] Remove deprecated name property in SPM package file for the Mocker dependency on Swift 5.9 (#881) --- Package@swift-5.9.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package@swift-5.9.swift b/Package@swift-5.9.swift index 1db62ef7d..e40a50023 100644 --- a/Package@swift-5.9.swift +++ b/Package@swift-5.9.swift @@ -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( From b361710592e800c745ef94e92cb597b47ab447d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matu=CC=81s=CC=8C=20Tomlein?= Date: Fri, 29 Mar 2024 15:03:28 +0100 Subject: [PATCH 3/5] Fix accessing media tracking instance not on internal queue (close #886) --- Sources/Core/InternalQueue/MediaControllerIQWrapper.swift | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Sources/Core/InternalQueue/MediaControllerIQWrapper.swift b/Sources/Core/InternalQueue/MediaControllerIQWrapper.swift index 541bcaf22..beaf0b2dc 100644 --- a/Sources/Core/InternalQueue/MediaControllerIQWrapper.swift +++ b/Sources/Core/InternalQueue/MediaControllerIQWrapper.swift @@ -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) { From 6c30bf6ec206a712fe6a9fc85b980c1bc21ff63d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matu=CC=81s=CC=8C=20Tomlein?= Date: Fri, 29 Mar 2024 15:06:06 +0100 Subject: [PATCH 4/5] Expose a public getter for EmitterEvent's payload and storeId properties (close #879) --- Sources/Snowplow/Emitter/EmitterEvent.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/Snowplow/Emitter/EmitterEvent.swift b/Sources/Snowplow/Emitter/EmitterEvent.swift index c5e9139a9..54ad06453 100644 --- a/Sources/Snowplow/Emitter/EmitterEvent.swift +++ b/Sources/Snowplow/Emitter/EmitterEvent.swift @@ -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) { From ebbafb5f1a62ad050b7a1cfaec35ddd08d2c6b52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matu=CC=81s=CC=8C=20Tomlein?= Date: Fri, 29 Mar 2024 12:23:52 +0100 Subject: [PATCH 5/5] Prepare for 6.0.2 release --- CHANGELOG | 7 +++++++ Examples | 2 +- SnowplowTracker.podspec | 2 +- Sources/Core/TrackerConstants.swift | 2 +- Sources/Snowplow/Events/ScreenView.swift | 8 ++++---- VERSION | 2 +- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 97273a437..1290e3d31 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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) diff --git a/Examples b/Examples index eadc74917..d663030de 160000 --- a/Examples +++ b/Examples @@ -1 +1 @@ -Subproject commit eadc74917e7c73f8851a4e44a3b38a607b0033b3 +Subproject commit d663030deaea5b6ed148045ffa11a752ba251be6 diff --git a/SnowplowTracker.podspec b/SnowplowTracker.podspec index 5a6527878..b098b45c1 100644 --- a/SnowplowTracker.podspec +++ b/SnowplowTracker.podspec @@ -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. diff --git a/Sources/Core/TrackerConstants.swift b/Sources/Core/TrackerConstants.swift index a20506218..d906fa649 100644 --- a/Sources/Core/TrackerConstants.swift +++ b/Sources/Core/TrackerConstants.swift @@ -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) diff --git a/Sources/Snowplow/Events/ScreenView.swift b/Sources/Snowplow/Events/ScreenView.swift index fe43a3282..a5dc43da2 100644 --- a/Sources/Snowplow/Events/ScreenView.swift +++ b/Sources/Snowplow/Events/ScreenView.swift @@ -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. @@ -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. @@ -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() @@ -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 diff --git a/VERSION b/VERSION index 5fe607230..9b9a24420 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.0.1 +6.0.2