Merge branch 'release/5.4.2'

snowplow · Aug 9, 2023 · 1f76199 · 1f76199
2 parents 10d0eaa + 5ae519a
commit 1f76199
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 9 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 5.4.2 (2023-08-08)
+--------------------------
+Update vendor and version of the player schema used in media tracking (#812)
+
 Version 5.4.1 (2023-07-19)
 --------------------------
 Add thread-safety to a globalContext manager function (#809)

diff --git a/Examples b/Examples
diff --git a/SnowplowTracker.podspec b/SnowplowTracker.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = "SnowplowTracker"
-    s.version          = "5.4.1"
+    s.version          = "5.4.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/Media/MediaSchemata.swift b/Sources/Core/Media/MediaSchemata.swift
@@ -16,7 +16,8 @@ import Foundation
 class MediaSchemata {
     private static let schemaPrefix = "iglu:com.snowplowanalytics.snowplow.media/"
     private static let schemaSuffix = "/jsonschema/1-0-0"
-    static let playerSchema = "\(schemaPrefix)player\(schemaSuffix)"
+    // NOTE: The player schema has a different vendor than the other media schemas because it builds on an older version of the same schema. Versions 5.3 to 5.4.1 of the tracker used a conflicting schema URI which has since been removed from Iglu Central.
+    static let playerSchema = "iglu:com.snowplowanalytics.snowplow/media_player/jsonschema/2-0-0"
     static let sessionSchema = "\(schemaPrefix)session\(schemaSuffix)"
     static let adSchema = "\(schemaPrefix)ad\(schemaSuffix)"
     static let adBreakSchema = "\(schemaPrefix)ad_break\(schemaSuffix)"

diff --git a/Sources/Core/TrackerConstants.swift b/Sources/Core/TrackerConstants.swift
@@ -14,7 +14,7 @@
 import Foundation
 
 // --- Version
-let kSPRawVersion = "5.4.1"
+let kSPRawVersion = "5.4.2"
 #if os(iOS)
 let kSPVersion = "ios-\(kSPRawVersion)"
 #elseif os(tvOS)

diff --git a/Sources/Snowplow/Media/Entities/MediaPlayerEntity.swift b/Sources/Snowplow/Media/Entities/MediaPlayerEntity.swift
@@ -39,7 +39,7 @@ extension MediaType {
 
 /**
  Properties for the media player context entity attached to media events.
- Entity schema: `iglu:com.snowplowanalytics.snowplow.media/player/jsonschema/1-0-0`
+ Entity schema: `iglu:com.snowplowanalytics.snowplow/media_player/jsonschema/2-0-0`
  */
 @objc(SPMediaPlayer)
 public class MediaPlayerEntity: NSObject {

diff --git a/Tests/Media/TestMediaController.swift b/Tests/Media/TestMediaController.swift
@@ -132,7 +132,7 @@ class TestMediaController: XCTestCase {
 
         XCTAssertEqual(1, trackedEvents.count)
         XCTAssert(firstEvent?.entities.contains { $0.schema == "test1" } ?? false)
-        XCTAssert(firstEvent?.entities.contains { $0.schema.contains("/player/") } ?? false)
+        XCTAssert(firstEvent?.entities.contains { $0.schema.contains("/media_player/") } ?? false)
     }
 
     func testTrackingPlaybackRateChangeEventUpdatesThePlaybackRate() {

diff --git a/Tests/Media/TestMediaEventAndEntitySerialization.swift b/Tests/Media/TestMediaEventAndEntitySerialization.swift
@@ -31,7 +31,7 @@ class TestMediaEventAndEntitySerialization: XCTestCase {
     func testBuildsEntityWithDefaultValuesForEmptyMediaPlayer() {
         let entity = MediaPlayerEntity().entity
 
-        XCTAssertEqual(mediaSchema(name: "player"), entity.schema)
+        XCTAssertEqual(mediaPlayerSchema, entity.schema)
         XCTAssertEqual(0.0, entity.data["currentTime"] as? Double)
         XCTAssertEqual(true, entity.data["paused"] as? Bool)
         XCTAssertEqual(false, entity.data["ended"] as? Bool)
@@ -56,7 +56,7 @@ class TestMediaEventAndEntitySerialization: XCTestCase {
             volume: 80
         ).entity
 
-        XCTAssertEqual(mediaSchema(name: "player"), entity.schema)
+        XCTAssertEqual(mediaPlayerSchema, entity.schema)
         XCTAssertEqual(33.3, entity.data["currentTime"] as? Double)
         XCTAssertEqual(false, entity.data["paused"] as? Bool)
         XCTAssertEqual(true, entity.data["fullscreen"] as? Bool)
@@ -131,4 +131,8 @@ class TestMediaEventAndEntitySerialization: XCTestCase {
     private func mediaSchema(name: String, version: String = "1-0-0") -> String {
         return "iglu:com.snowplowanalytics.snowplow.media/" + name + "/jsonschema/" + version
     }
+
+    private var mediaPlayerSchema: String {
+        return "iglu:com.snowplowanalytics.snowplow/media_player/jsonschema/2-0-0"
+    }
 }
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.4.1
+5.4.2
+10 −1		demo/CommonSwiftCode/PageViewController.swift
+3 −3		demo/SnowplowObjcDemo/Podfile.lock
+3 −3		demo/SnowplowSwiftCocoapodsDemo/Podfile.lock