From 373c44a536f8edd880fbd0f2c20230e98eb6c18f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20De=CC=81fago?= <defagos@gmail.com>
Date: Fri, 28 Sep 2018 15:01:11 +0200
Subject: [PATCH 01/13] Bump version number

---
 SRGAnalytics.xcodeproj/project.pbxproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/SRGAnalytics.xcodeproj/project.pbxproj b/SRGAnalytics.xcodeproj/project.pbxproj
index edef5048..5013d1bb 100644
--- a/SRGAnalytics.xcodeproj/project.pbxproj
+++ b/SRGAnalytics.xcodeproj/project.pbxproj
@@ -1286,7 +1286,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MARKETING_VERSION = 3.5;
+				MARKETING_VERSION = 3.5.1;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 			};
@@ -1479,7 +1479,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MARKETING_VERSION = 3.5;
+				MARKETING_VERSION = 3.5.1;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
@@ -1815,7 +1815,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MARKETING_VERSION = 3.5;
+				MARKETING_VERSION = 3.5.1;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 			};
@@ -1865,7 +1865,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MARKETING_VERSION = 3.5;
+				MARKETING_VERSION = 3.5.1;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};

From c144701c8802eff6f7bbcba0bffd75b3630a4739 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Bertholon <py.bertholon@gmail.com>
Date: Mon, 1 Oct 2018 15:13:31 +0200
Subject: [PATCH 02/13] Add multi values for hidden events

---
 Framework/Sources/Core/SRGAnalyticsHiddenEventLabels.h | 6 ++++++
 Framework/Sources/Core/SRGAnalyticsHiddenEventLabels.m | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/Framework/Sources/Core/SRGAnalyticsHiddenEventLabels.h b/Framework/Sources/Core/SRGAnalyticsHiddenEventLabels.h
index b42204a6..93bb501f 100644
--- a/Framework/Sources/Core/SRGAnalyticsHiddenEventLabels.h
+++ b/Framework/Sources/Core/SRGAnalyticsHiddenEventLabels.h
@@ -25,6 +25,12 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, copy, nullable) NSString *value;
 
+/**
+ *  The event values (this concept is loosely defined, please discuss expected values for your application with your
+ *  measurement team).
+ */
+@property (nonatomic, copy, nullable) NSArray<NSString *> *values;
+
 /**
  *  The event source (this concept is loosely defined, please discuss expected values for your application with your
  *  measurement team).
diff --git a/Framework/Sources/Core/SRGAnalyticsHiddenEventLabels.m b/Framework/Sources/Core/SRGAnalyticsHiddenEventLabels.m
index dbc60885..67a6e350 100644
--- a/Framework/Sources/Core/SRGAnalyticsHiddenEventLabels.m
+++ b/Framework/Sources/Core/SRGAnalyticsHiddenEventLabels.m
@@ -20,6 +20,12 @@ @implementation SRGAnalyticsHiddenEventLabels
     [dictionary srg_safelySetString:self.value forKey:@"event_value"];
     [dictionary srg_safelySetString:self.source forKey:@"event_source"];
     
+    NSUInteger valueIndex = 1;
+    for (NSString *value in self.values) {
+        [dictionary srg_safelySetString:value forKey:[NSString stringWithFormat:@"event_value_%lu", valueIndex]];
+        valueIndex++;
+    }
+    
     [dictionary addEntriesFromDictionary:[super labelsDictionary]];
     return [dictionary copy];
 }
@@ -43,6 +49,7 @@ - (id)copyWithZone:(NSZone *)zone
     SRGAnalyticsHiddenEventLabels *labels = [super copyWithZone:zone];
     labels.type = self.type;
     labels.value = self.value;
+    labels.values = self.values.copy;
     labels.source = self.source;
     return labels;
 }

From 4b85abe0a3e07a9159a2de3251b7b16cef756e5f Mon Sep 17 00:00:00 2001
From: Pierre-Yves Bertholon <py.bertholon@gmail.com>
Date: Mon, 1 Oct 2018 20:57:23 +0200
Subject: [PATCH 03/13] Add unit tests for hidden event values

---
 Tests/Sources/HiddenEventLabelsTestCase.m | 49 ++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/Tests/Sources/HiddenEventLabelsTestCase.m b/Tests/Sources/HiddenEventLabelsTestCase.m
index 891a44e1..5776f1dc 100644
--- a/Tests/Sources/HiddenEventLabelsTestCase.m
+++ b/Tests/Sources/HiddenEventLabelsTestCase.m
@@ -25,11 +25,14 @@ - (void)testNonEmpty
     labels.type = @"type";
     labels.value = @"value";
     labels.source = @"source";
+    labels.values = @[ @"value1", @"value2" ];
     labels.customInfo = @{ @"key" : @"value" };
     
     NSDictionary *labelsDictionary = @{ @"event_type" : @"type",
                                         @"event_value" : @"value",
                                         @"event_source" : @"source",
+                                        @"event_value_1" : @"value1",
+                                        @"event_value_2" : @"value2",
                                         @"key" : @"value" };
     XCTAssertEqualObjects(labels.labelsDictionary, labelsDictionary);
 }
@@ -40,6 +43,7 @@ - (void)testEquality
     labels1.type = @"type";
     labels1.value = @"value";
     labels1.source = @"source";
+    labels1.values = @[ @"value1", @"value2" ];
     labels1.customInfo = @{ @"key" : @"value" };
     XCTAssertEqualObjects(labels1, labels1);
     
@@ -47,6 +51,7 @@ - (void)testEquality
     labels2.type = @"type";
     labels2.value = @"value";
     labels2.source = @"source";
+    labels2.values = @[ @"value1", @"value2" ];
     labels2.customInfo = @{ @"key" : @"value" };
     XCTAssertEqualObjects(labels1, labels2);
     
@@ -54,6 +59,7 @@ - (void)testEquality
     labels3.type = @"other_type";
     labels3.value = @"value";
     labels3.source = @"source";
+    labels3.values = @[ @"value1", @"value2" ];
     labels3.customInfo = @{ @"key" : @"value" };
     XCTAssertNotEqualObjects(labels1, labels3);
     
@@ -61,6 +67,7 @@ - (void)testEquality
     labels4.type = @"type";
     labels4.value = @"other_value";
     labels4.source = @"source";
+    labels4.values = @[ @"value1", @"value2" ];
     labels4.customInfo = @{ @"key" : @"value" };
     XCTAssertNotEqualObjects(labels1, labels4);
     
@@ -68,15 +75,27 @@ - (void)testEquality
     labels5.type = @"type";
     labels5.value = @"value";
     labels5.source = @"other_source";
+    labels5.values = @[ @"value1", @"value2" ];
     labels5.customInfo = @{ @"key" : @"value" };
     XCTAssertNotEqualObjects(labels1, labels5);
     
     SRGAnalyticsHiddenEventLabels *labels6 = [[SRGAnalyticsHiddenEventLabels alloc] init];
     labels6.type = @"type";
     labels6.value = @"value";
+    labels6.values = @[ @"other_value1", @"value2" ];
     labels6.source = @"source";
-    labels6.customInfo = @{ @"other_key" : @"other_value" };
+    labels6.customInfo = @{ @"key" : @"value" };
     XCTAssertNotEqualObjects(labels1, labels6);
+    
+    SRGAnalyticsHiddenEventLabels *labels7 = [[SRGAnalyticsHiddenEventLabels alloc] init];
+    labels7.type = @"type";
+    labels7.value = @"value";
+    labels7.source = @"source";
+    labels7.values = @[ @"value1", @"value2" ];
+    labels7.customInfo = @{ @"other_key" : @"other_value" };
+    XCTAssertNotEqualObjects(labels1, labels7);
+    
+    
 }
 
 - (void)testCopy
@@ -85,6 +104,7 @@ - (void)testCopy
     labels.type = @"type";
     labels.value = @"value";
     labels.source = @"source";
+    labels.values = @[ @"value1", @"value2" ];
     labels.customInfo = @{ @"key" : @"value" };
     
     SRGAnalyticsHiddenEventLabels *labelsCopy = [labels copy];
@@ -103,4 +123,31 @@ - (void)testCustomInfoOverrides
     XCTAssertEqualObjects(labels.labelsDictionary, labels.customInfo);
 }
 
+- (void)testValues
+{
+    NSMutableArray *values = @[ @"value1", @"value2" ].mutableCopy;
+    SRGAnalyticsHiddenEventLabels *labels1 = [[SRGAnalyticsHiddenEventLabels alloc] init];
+    labels1.values = values;
+    
+    [values removeObjectAtIndex:0];
+    [values addObject:@"value1"];
+    
+    SRGAnalyticsHiddenEventLabels *labels1Copy = [labels1 copy];
+    labels1Copy.values = values;
+    XCTAssertNotEqualObjects(labels1, labels1Copy);
+    
+    SRGAnalyticsHiddenEventLabels *labels2 = [[SRGAnalyticsHiddenEventLabels alloc] init];
+    labels2.values = @[ @"value5", @"value4", @"value3", @"value2", @"value1" ];
+    NSDictionary *labelsDictionary = @{ @"event_value_1" : @"value5",
+                                        @"event_value_2" : @"value4",
+                                        @"event_value_3" : @"value3",
+                                        @"event_value_4" : @"value2",
+                                        @"event_value_5" : @"value1" };
+    XCTAssertEqualObjects(labels2.labelsDictionary, labelsDictionary);
+    
+    SRGAnalyticsHiddenEventLabels *labels3 = [[SRGAnalyticsHiddenEventLabels alloc] init];
+    labels3.values = @[];
+    XCTAssertEqual(labels3.labelsDictionary.count, 0);
+}
+
 @end

From 9095f2789d7de87e5ef8a127ce159fd3f6986cb6 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Bertholon <py.bertholon@gmail.com>
Date: Mon, 1 Oct 2018 21:03:20 +0200
Subject: [PATCH 04/13] Refactor hidden event values

---
 Framework/Sources/Core/SRGAnalyticsHiddenEventLabels.m | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Framework/Sources/Core/SRGAnalyticsHiddenEventLabels.m b/Framework/Sources/Core/SRGAnalyticsHiddenEventLabels.m
index 67a6e350..bd4f7ef1 100644
--- a/Framework/Sources/Core/SRGAnalyticsHiddenEventLabels.m
+++ b/Framework/Sources/Core/SRGAnalyticsHiddenEventLabels.m
@@ -20,11 +20,10 @@ @implementation SRGAnalyticsHiddenEventLabels
     [dictionary srg_safelySetString:self.value forKey:@"event_value"];
     [dictionary srg_safelySetString:self.source forKey:@"event_source"];
     
-    NSUInteger valueIndex = 1;
-    for (NSString *value in self.values) {
-        [dictionary srg_safelySetString:value forKey:[NSString stringWithFormat:@"event_value_%lu", valueIndex]];
-        valueIndex++;
-    }
+    [self.values enumerateObjectsUsingBlock:^(NSString * _Nonnull object, NSUInteger idx, BOOL * _Nonnull stop) {
+        NSString *valueKey = [NSString stringWithFormat:@"event_value_%@", @(idx + 1)];
+        [dictionary srg_safelySetString:object forKey:valueKey];
+    }];
     
     [dictionary addEntriesFromDictionary:[super labelsDictionary]];
     return [dictionary copy];

From 133bb08cc9fc9fd7d81893f052d4917af23b5297 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20De=CC=81fago?= <defagos@gmail.com>
Date: Tue, 2 Oct 2018 09:05:39 +0200
Subject: [PATCH 05/13] Make extra hidden event information easier to set

- Value vs. values was confusing. There is now a main value and extra values.
- Measurement specifications probably need extra information at specific locations. Having a single array to set the values is problematic in case some values are missing in the list (e.g. only 2nd and 4th extra values are not nil). It is therefore easier to have as many setters as needed.
---
 .../Core/SRGAnalyticsHiddenEventLabels.h      | 22 ++++---
 .../Core/SRGAnalyticsHiddenEventLabels.m      | 17 +++--
 Tests/Sources/HiddenEventLabelsTestCase.m     | 66 ++++++++-----------
 3 files changed, 50 insertions(+), 55 deletions(-)

diff --git a/Framework/Sources/Core/SRGAnalyticsHiddenEventLabels.h b/Framework/Sources/Core/SRGAnalyticsHiddenEventLabels.h
index 93bb501f..9d3955cb 100644
--- a/Framework/Sources/Core/SRGAnalyticsHiddenEventLabels.h
+++ b/Framework/Sources/Core/SRGAnalyticsHiddenEventLabels.h
@@ -9,31 +9,33 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /**
- *  Additional hidden event labels.
+ *  Additional hidden event labels. Data associated with a hidden event is generic (type, values and source) and
+ *  therefore flexible. Your measurement team should provide you precise guidelines about which information must
+ *  be sent in hidden events, and in which fields.
  */
 @interface SRGAnalyticsHiddenEventLabels : SRGAnalyticsLabels
 
 /**
- *  The event type (this concept is loosely defined, please discuss expected values for your application with your
- *  measurement team).
+ *  The event type.
  */
 @property (nonatomic, copy, nullable) NSString *type;
 
 /**
- *  The event value (this concept is loosely defined, please discuss expected values for your application with your
- *  measurement team).
+ *  The main value associated with the event.
  */
 @property (nonatomic, copy, nullable) NSString *value;
 
 /**
- *  The event values (this concept is loosely defined, please discuss expected values for your application with your
- *  measurement team).
+ *  Additional values associated with the event.
  */
-@property (nonatomic, copy, nullable) NSArray<NSString *> *values;
+@property (nonatomic, copy, nullable) NSString *extraValue1;
+@property (nonatomic, copy, nullable) NSString *extraValue2;
+@property (nonatomic, copy, nullable) NSString *extraValue3;
+@property (nonatomic, copy, nullable) NSString *extraValue4;
+@property (nonatomic, copy, nullable) NSString *extraValue5;
 
 /**
- *  The event source (this concept is loosely defined, please discuss expected values for your application with your
- *  measurement team).
+ *  The event source.
  */
 @property (nonatomic, copy, nullable) NSString *source;
 
diff --git a/Framework/Sources/Core/SRGAnalyticsHiddenEventLabels.m b/Framework/Sources/Core/SRGAnalyticsHiddenEventLabels.m
index bd4f7ef1..85687364 100644
--- a/Framework/Sources/Core/SRGAnalyticsHiddenEventLabels.m
+++ b/Framework/Sources/Core/SRGAnalyticsHiddenEventLabels.m
@@ -20,10 +20,11 @@ @implementation SRGAnalyticsHiddenEventLabels
     [dictionary srg_safelySetString:self.value forKey:@"event_value"];
     [dictionary srg_safelySetString:self.source forKey:@"event_source"];
     
-    [self.values enumerateObjectsUsingBlock:^(NSString * _Nonnull object, NSUInteger idx, BOOL * _Nonnull stop) {
-        NSString *valueKey = [NSString stringWithFormat:@"event_value_%@", @(idx + 1)];
-        [dictionary srg_safelySetString:object forKey:valueKey];
-    }];
+    [dictionary srg_safelySetString:self.extraValue1 forKey:@"event_value_1"];
+    [dictionary srg_safelySetString:self.extraValue2 forKey:@"event_value_2"];
+    [dictionary srg_safelySetString:self.extraValue3 forKey:@"event_value_3"];
+    [dictionary srg_safelySetString:self.extraValue4 forKey:@"event_value_4"];
+    [dictionary srg_safelySetString:self.extraValue5 forKey:@"event_value_5"];
     
     [dictionary addEntriesFromDictionary:[super labelsDictionary]];
     return [dictionary copy];
@@ -48,8 +49,14 @@ - (id)copyWithZone:(NSZone *)zone
     SRGAnalyticsHiddenEventLabels *labels = [super copyWithZone:zone];
     labels.type = self.type;
     labels.value = self.value;
-    labels.values = self.values.copy;
     labels.source = self.source;
+    
+    labels.extraValue1 = self.extraValue1;
+    labels.extraValue2 = self.extraValue2;
+    labels.extraValue3 = self.extraValue3;
+    labels.extraValue4 = self.extraValue4;
+    labels.extraValue5 = self.extraValue5;
+    
     return labels;
 }
 
diff --git a/Tests/Sources/HiddenEventLabelsTestCase.m b/Tests/Sources/HiddenEventLabelsTestCase.m
index 5776f1dc..397fed32 100644
--- a/Tests/Sources/HiddenEventLabelsTestCase.m
+++ b/Tests/Sources/HiddenEventLabelsTestCase.m
@@ -25,14 +25,21 @@ - (void)testNonEmpty
     labels.type = @"type";
     labels.value = @"value";
     labels.source = @"source";
-    labels.values = @[ @"value1", @"value2" ];
+    labels.extraValue1 = @"extra_value1";
+    labels.extraValue2 = @"extra_value2";
+    labels.extraValue3 = @"extra_value3";
+    labels.extraValue4 = @"extra_value4";
+    labels.extraValue5 = @"extra_value5";
     labels.customInfo = @{ @"key" : @"value" };
     
     NSDictionary *labelsDictionary = @{ @"event_type" : @"type",
                                         @"event_value" : @"value",
                                         @"event_source" : @"source",
-                                        @"event_value_1" : @"value1",
-                                        @"event_value_2" : @"value2",
+                                        @"event_value_1" : @"extra_value1",
+                                        @"event_value_2" : @"extra_value2",
+                                        @"event_value_3" : @"extra_value3",
+                                        @"event_value_4" : @"extra_value4",
+                                        @"event_value_5" : @"extra_value5",
                                         @"key" : @"value" };
     XCTAssertEqualObjects(labels.labelsDictionary, labelsDictionary);
 }
@@ -43,7 +50,8 @@ - (void)testEquality
     labels1.type = @"type";
     labels1.value = @"value";
     labels1.source = @"source";
-    labels1.values = @[ @"value1", @"value2" ];
+    labels1.extraValue1 = @"extra_value1";
+    labels1.extraValue2 = @"extra_value2";
     labels1.customInfo = @{ @"key" : @"value" };
     XCTAssertEqualObjects(labels1, labels1);
     
@@ -51,7 +59,8 @@ - (void)testEquality
     labels2.type = @"type";
     labels2.value = @"value";
     labels2.source = @"source";
-    labels2.values = @[ @"value1", @"value2" ];
+    labels2.extraValue1 = @"extra_value1";
+    labels2.extraValue2 = @"extra_value2";
     labels2.customInfo = @{ @"key" : @"value" };
     XCTAssertEqualObjects(labels1, labels2);
     
@@ -59,7 +68,8 @@ - (void)testEquality
     labels3.type = @"other_type";
     labels3.value = @"value";
     labels3.source = @"source";
-    labels3.values = @[ @"value1", @"value2" ];
+    labels3.extraValue1 = @"extra_value1";
+    labels3.extraValue2 = @"extra_value2";
     labels3.customInfo = @{ @"key" : @"value" };
     XCTAssertNotEqualObjects(labels1, labels3);
     
@@ -67,7 +77,8 @@ - (void)testEquality
     labels4.type = @"type";
     labels4.value = @"other_value";
     labels4.source = @"source";
-    labels4.values = @[ @"value1", @"value2" ];
+    labels4.extraValue1 = @"extra_value1";
+    labels4.extraValue2 = @"extra_value2";
     labels4.customInfo = @{ @"key" : @"value" };
     XCTAssertNotEqualObjects(labels1, labels4);
     
@@ -75,14 +86,16 @@ - (void)testEquality
     labels5.type = @"type";
     labels5.value = @"value";
     labels5.source = @"other_source";
-    labels5.values = @[ @"value1", @"value2" ];
+    labels5.extraValue1 = @"extra_value1";
+    labels5.extraValue2 = @"extra_value2";
     labels5.customInfo = @{ @"key" : @"value" };
     XCTAssertNotEqualObjects(labels1, labels5);
     
     SRGAnalyticsHiddenEventLabels *labels6 = [[SRGAnalyticsHiddenEventLabels alloc] init];
     labels6.type = @"type";
     labels6.value = @"value";
-    labels6.values = @[ @"other_value1", @"value2" ];
+    labels6.extraValue1 = @"other_extra_value1";
+    labels6.extraValue2 = @"extra_value2";
     labels6.source = @"source";
     labels6.customInfo = @{ @"key" : @"value" };
     XCTAssertNotEqualObjects(labels1, labels6);
@@ -91,11 +104,10 @@ - (void)testEquality
     labels7.type = @"type";
     labels7.value = @"value";
     labels7.source = @"source";
-    labels7.values = @[ @"value1", @"value2" ];
+    labels7.extraValue1 = @"extra_value1";
+    labels7.extraValue2 = @"extra_value2";
     labels7.customInfo = @{ @"other_key" : @"other_value" };
     XCTAssertNotEqualObjects(labels1, labels7);
-    
-    
 }
 
 - (void)testCopy
@@ -104,7 +116,8 @@ - (void)testCopy
     labels.type = @"type";
     labels.value = @"value";
     labels.source = @"source";
-    labels.values = @[ @"value1", @"value2" ];
+    labels.extraValue1 = @"extra_value1";
+    labels.extraValue2 = @"extra_value2";
     labels.customInfo = @{ @"key" : @"value" };
     
     SRGAnalyticsHiddenEventLabels *labelsCopy = [labels copy];
@@ -123,31 +136,4 @@ - (void)testCustomInfoOverrides
     XCTAssertEqualObjects(labels.labelsDictionary, labels.customInfo);
 }
 
-- (void)testValues
-{
-    NSMutableArray *values = @[ @"value1", @"value2" ].mutableCopy;
-    SRGAnalyticsHiddenEventLabels *labels1 = [[SRGAnalyticsHiddenEventLabels alloc] init];
-    labels1.values = values;
-    
-    [values removeObjectAtIndex:0];
-    [values addObject:@"value1"];
-    
-    SRGAnalyticsHiddenEventLabels *labels1Copy = [labels1 copy];
-    labels1Copy.values = values;
-    XCTAssertNotEqualObjects(labels1, labels1Copy);
-    
-    SRGAnalyticsHiddenEventLabels *labels2 = [[SRGAnalyticsHiddenEventLabels alloc] init];
-    labels2.values = @[ @"value5", @"value4", @"value3", @"value2", @"value1" ];
-    NSDictionary *labelsDictionary = @{ @"event_value_1" : @"value5",
-                                        @"event_value_2" : @"value4",
-                                        @"event_value_3" : @"value3",
-                                        @"event_value_4" : @"value2",
-                                        @"event_value_5" : @"value1" };
-    XCTAssertEqualObjects(labels2.labelsDictionary, labelsDictionary);
-    
-    SRGAnalyticsHiddenEventLabels *labels3 = [[SRGAnalyticsHiddenEventLabels alloc] init];
-    labels3.values = @[];
-    XCTAssertEqual(labels3.labelsDictionary.count, 0);
-}
-
 @end

From 0cf3075521e4aa3d5aad461901af36dca09d280e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20De=CC=81fago?= <defagos@gmail.com>
Date: Fri, 5 Oct 2018 10:13:10 +0200
Subject: [PATCH 06/13] Use consistent naming scheme

---
 docs/{Getting-started.md => GETTING_STARTED.md} | 0
 docs/{Migration-guide.md => MIGRATION_GUIDE.md} | 0
 docs/README.md                                  | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename docs/{Getting-started.md => GETTING_STARTED.md} (100%)
 rename docs/{Migration-guide.md => MIGRATION_GUIDE.md} (100%)

diff --git a/docs/Getting-started.md b/docs/GETTING_STARTED.md
similarity index 100%
rename from docs/Getting-started.md
rename to docs/GETTING_STARTED.md
diff --git a/docs/Migration-guide.md b/docs/MIGRATION_GUIDE.md
similarity index 100%
rename from docs/Migration-guide.md
rename to docs/MIGRATION_GUIDE.md
diff --git a/docs/README.md b/docs/README.md
index b3e80896..8fb0bf63 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -170,7 +170,7 @@ The number of URL schemes an application declares is limited to 50. Please conta
 
 ### Working with the library
 
-To learn about how the library can be used, have a look at the [getting started guide](Getting-started.md).
+To learn about how the library can be used, have a look at the [getting started guide](GETTING_STARTED.md).
 
 ### Logging
 
@@ -192,7 +192,7 @@ To test what the library is capable of, run the associated demo.
 
 ## Migration from previous major versions
 
-For information about migration from older major library versions, please read the [migration guide](Migration-guide.md).
+For information about migration from older major library versions, please read the [migration guide](MIGRATION_GUIDE.md).
 
 ## License
 

From 6f3f7b0fc3a4054c29d413dafe1c65215324e1b0 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Bertholon <py.bertholon@gmail.com>
Date: Wed, 17 Oct 2018 21:50:12 +0200
Subject: [PATCH 07/13] Update data provider urls

---
 Cartfile                                     | 2 +-
 Cartfile.resolved.proprietary                | 2 +-
 Cartfile.resolved.public                     | 2 +-
 Tests/Sources/ComScoreDataProviderTestCase.m | 2 +-
 Tests/Sources/DataProviderTestCase.m         | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cartfile b/Cartfile
index 56d1d05e..1410c9a0 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,4 +1,4 @@
-github "SRGSSR/srgdataprovider-ios" "6.3"
+github "SRGSSR/srgdataprovider-ios" "c970e72e595e22f7a8b13d747aeaf26f88f3b46b"
 github "SRGSSR/SRGMediaPlayer-iOS" "2.5.2"
 github "SRGSSR/tagcommander-ios" "4.1.5_4.1.3"
 github "comScore/ComScore-iOS-SDK" "92f34897cd7659d56bb5a3e9e85b808cf3758bda"
\ No newline at end of file
diff --git a/Cartfile.resolved.proprietary b/Cartfile.resolved.proprietary
index a0ec1fb0..3e32dee8 100644
--- a/Cartfile.resolved.proprietary
+++ b/Cartfile.resolved.proprietary
@@ -3,7 +3,7 @@ github "SRGSSR/MAKVONotificationCenter" "1.0_srg2"
 github "SRGSSR/SRGMediaPlayer-iOS" "2.5.2"
 github "SRGSSR/libextobjc" "0.6_srg1"
 github "SRGSSR/srgcontentprotection-ios" "1.1"
-github "SRGSSR/srgdataprovider-ios" "6.3"
+github "SRGSSR/srgdataprovider-ios" "c970e72e595e22f7a8b13d747aeaf26f88f3b46b"
 github "SRGSSR/srgdiagnostics-ios" "1.0"
 github "SRGSSR/srglogger-ios" "1.0.7"
 github "SRGSSR/srgnetwork-ios" "0.2.1"
diff --git a/Cartfile.resolved.public b/Cartfile.resolved.public
index a041c7f7..57e4a868 100644
--- a/Cartfile.resolved.public
+++ b/Cartfile.resolved.public
@@ -3,7 +3,7 @@ github "SRGSSR/MAKVONotificationCenter" "1.0_srg2"
 github "SRGSSR/SRGMediaPlayer-iOS" "2.5.2"
 github "SRGSSR/libextobjc" "0.6_srg1"
 github "SRGSSR/srgcontentprotection-fake-ios" "1.1"
-github "SRGSSR/srgdataprovider-ios" "6.3"
+github "SRGSSR/srgdataprovider-ios" "c970e72e595e22f7a8b13d747aeaf26f88f3b46b"
 github "SRGSSR/srgdiagnostics-ios" "1.0"
 github "SRGSSR/srglogger-ios" "1.0.7"
 github "SRGSSR/srgnetwork-ios" "0.2.1"
diff --git a/Tests/Sources/ComScoreDataProviderTestCase.m b/Tests/Sources/ComScoreDataProviderTestCase.m
index ab926873..b82e645b 100644
--- a/Tests/Sources/ComScoreDataProviderTestCase.m
+++ b/Tests/Sources/ComScoreDataProviderTestCase.m
@@ -10,7 +10,7 @@
 
 static NSURL *ServiceTestURL(void)
 {
-    return [NSURL URLWithString:@"http://il.srgssr.ch"];
+    return SRGIntegrationLayerProductionServiceURL();
 }
 
 @interface ComScoreDataProviderTestCase : AnalyticsTestCase
diff --git a/Tests/Sources/DataProviderTestCase.m b/Tests/Sources/DataProviderTestCase.m
index 6ea21507..6f529d43 100644
--- a/Tests/Sources/DataProviderTestCase.m
+++ b/Tests/Sources/DataProviderTestCase.m
@@ -14,12 +14,12 @@
 
 static NSURL *ServiceTestURL(void)
 {
-    return [NSURL URLWithString:@"http://il.srgssr.ch"];
+    return SRGIntegrationLayerProductionServiceURL();
 }
 
 static NSURL *MMFTestURL(void)
 {
-    return [NSURL URLWithString:@"http://play-mmf.herokuapp.com"];
+    return [NSURL URLWithString:@"https://play-mmf.herokuapp.com/integrationlayer"];
 }
 
 @interface DataProviderTestCase : AnalyticsTestCase

From 21dd0b408b182365615b10fa1d7d6bdb3e08a7c3 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Bertholon <py.bertholon@gmail.com>
Date: Wed, 17 Oct 2018 22:35:58 +0200
Subject: [PATCH 08/13] Update dependencies

---
 Cartfile                      | 2 +-
 Cartfile.resolved.proprietary | 2 +-
 Cartfile.resolved.public      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cartfile b/Cartfile
index 1410c9a0..02ff0f39 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,4 +1,4 @@
-github "SRGSSR/srgdataprovider-ios" "c970e72e595e22f7a8b13d747aeaf26f88f3b46b"
+github "SRGSSR/srgdataprovider-ios" "456e6a458acbd8f8d6744380625e17ed61657bbc"
 github "SRGSSR/SRGMediaPlayer-iOS" "2.5.2"
 github "SRGSSR/tagcommander-ios" "4.1.5_4.1.3"
 github "comScore/ComScore-iOS-SDK" "92f34897cd7659d56bb5a3e9e85b808cf3758bda"
\ No newline at end of file
diff --git a/Cartfile.resolved.proprietary b/Cartfile.resolved.proprietary
index 3e32dee8..535700c9 100644
--- a/Cartfile.resolved.proprietary
+++ b/Cartfile.resolved.proprietary
@@ -3,7 +3,7 @@ github "SRGSSR/MAKVONotificationCenter" "1.0_srg2"
 github "SRGSSR/SRGMediaPlayer-iOS" "2.5.2"
 github "SRGSSR/libextobjc" "0.6_srg1"
 github "SRGSSR/srgcontentprotection-ios" "1.1"
-github "SRGSSR/srgdataprovider-ios" "c970e72e595e22f7a8b13d747aeaf26f88f3b46b"
+github "SRGSSR/srgdataprovider-ios" "456e6a458acbd8f8d6744380625e17ed61657bbc"
 github "SRGSSR/srgdiagnostics-ios" "1.0"
 github "SRGSSR/srglogger-ios" "1.0.7"
 github "SRGSSR/srgnetwork-ios" "0.2.1"
diff --git a/Cartfile.resolved.public b/Cartfile.resolved.public
index 57e4a868..452b9b5e 100644
--- a/Cartfile.resolved.public
+++ b/Cartfile.resolved.public
@@ -3,7 +3,7 @@ github "SRGSSR/MAKVONotificationCenter" "1.0_srg2"
 github "SRGSSR/SRGMediaPlayer-iOS" "2.5.2"
 github "SRGSSR/libextobjc" "0.6_srg1"
 github "SRGSSR/srgcontentprotection-fake-ios" "1.1"
-github "SRGSSR/srgdataprovider-ios" "c970e72e595e22f7a8b13d747aeaf26f88f3b46b"
+github "SRGSSR/srgdataprovider-ios" "456e6a458acbd8f8d6744380625e17ed61657bbc"
 github "SRGSSR/srgdiagnostics-ios" "1.0"
 github "SRGSSR/srglogger-ios" "1.0.7"
 github "SRGSSR/srgnetwork-ios" "0.2.1"

From d8b21c34e0071753a3a8f97dacdecd162d08853e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20De=CC=81fago?= <defagos@gmail.com>
Date: Thu, 18 Oct 2018 16:55:38 +0200
Subject: [PATCH 09/13] Update dependencies

---
 Cartfile                      | 2 +-
 Cartfile.resolved.proprietary | 2 +-
 Cartfile.resolved.public      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cartfile b/Cartfile
index 02ff0f39..7b399f78 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,4 +1,4 @@
-github "SRGSSR/srgdataprovider-ios" "456e6a458acbd8f8d6744380625e17ed61657bbc"
+github "SRGSSR/srgdataprovider-ios" "3240463717dc49b1d5d85daf76a1127ba14e94a9"
 github "SRGSSR/SRGMediaPlayer-iOS" "2.5.2"
 github "SRGSSR/tagcommander-ios" "4.1.5_4.1.3"
 github "comScore/ComScore-iOS-SDK" "92f34897cd7659d56bb5a3e9e85b808cf3758bda"
\ No newline at end of file
diff --git a/Cartfile.resolved.proprietary b/Cartfile.resolved.proprietary
index 535700c9..c70a3af2 100644
--- a/Cartfile.resolved.proprietary
+++ b/Cartfile.resolved.proprietary
@@ -3,7 +3,7 @@ github "SRGSSR/MAKVONotificationCenter" "1.0_srg2"
 github "SRGSSR/SRGMediaPlayer-iOS" "2.5.2"
 github "SRGSSR/libextobjc" "0.6_srg1"
 github "SRGSSR/srgcontentprotection-ios" "1.1"
-github "SRGSSR/srgdataprovider-ios" "456e6a458acbd8f8d6744380625e17ed61657bbc"
+github "SRGSSR/srgdataprovider-ios" "3240463717dc49b1d5d85daf76a1127ba14e94a9"
 github "SRGSSR/srgdiagnostics-ios" "1.0"
 github "SRGSSR/srglogger-ios" "1.0.7"
 github "SRGSSR/srgnetwork-ios" "0.2.1"
diff --git a/Cartfile.resolved.public b/Cartfile.resolved.public
index 452b9b5e..1a9317ff 100644
--- a/Cartfile.resolved.public
+++ b/Cartfile.resolved.public
@@ -3,7 +3,7 @@ github "SRGSSR/MAKVONotificationCenter" "1.0_srg2"
 github "SRGSSR/SRGMediaPlayer-iOS" "2.5.2"
 github "SRGSSR/libextobjc" "0.6_srg1"
 github "SRGSSR/srgcontentprotection-fake-ios" "1.1"
-github "SRGSSR/srgdataprovider-ios" "456e6a458acbd8f8d6744380625e17ed61657bbc"
+github "SRGSSR/srgdataprovider-ios" "3240463717dc49b1d5d85daf76a1127ba14e94a9"
 github "SRGSSR/srgdiagnostics-ios" "1.0"
 github "SRGSSR/srglogger-ios" "1.0.7"
 github "SRGSSR/srgnetwork-ios" "0.2.1"

From c03f80897360ec4c278471f6253d47b290d6b04b Mon Sep 17 00:00:00 2001
From: Pierre-Yves Bertholon <py.bertholon@gmail.com>
Date: Thu, 18 Oct 2018 18:24:48 +0200
Subject: [PATCH 10/13] Update dependencies

---
 Cartfile                      | 2 +-
 Cartfile.resolved.proprietary | 2 +-
 Cartfile.resolved.public      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cartfile b/Cartfile
index 7b399f78..6408120f 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,4 +1,4 @@
-github "SRGSSR/srgdataprovider-ios" "3240463717dc49b1d5d85daf76a1127ba14e94a9"
+github "SRGSSR/srgdataprovider-ios" "2f6bb0977626b105074ecc7822a407f63a21186e"
 github "SRGSSR/SRGMediaPlayer-iOS" "2.5.2"
 github "SRGSSR/tagcommander-ios" "4.1.5_4.1.3"
 github "comScore/ComScore-iOS-SDK" "92f34897cd7659d56bb5a3e9e85b808cf3758bda"
\ No newline at end of file
diff --git a/Cartfile.resolved.proprietary b/Cartfile.resolved.proprietary
index c70a3af2..a7aa58ab 100644
--- a/Cartfile.resolved.proprietary
+++ b/Cartfile.resolved.proprietary
@@ -3,7 +3,7 @@ github "SRGSSR/MAKVONotificationCenter" "1.0_srg2"
 github "SRGSSR/SRGMediaPlayer-iOS" "2.5.2"
 github "SRGSSR/libextobjc" "0.6_srg1"
 github "SRGSSR/srgcontentprotection-ios" "1.1"
-github "SRGSSR/srgdataprovider-ios" "3240463717dc49b1d5d85daf76a1127ba14e94a9"
+github "SRGSSR/srgdataprovider-ios" "2f6bb0977626b105074ecc7822a407f63a21186e"
 github "SRGSSR/srgdiagnostics-ios" "1.0"
 github "SRGSSR/srglogger-ios" "1.0.7"
 github "SRGSSR/srgnetwork-ios" "0.2.1"
diff --git a/Cartfile.resolved.public b/Cartfile.resolved.public
index 1a9317ff..f117e551 100644
--- a/Cartfile.resolved.public
+++ b/Cartfile.resolved.public
@@ -3,7 +3,7 @@ github "SRGSSR/MAKVONotificationCenter" "1.0_srg2"
 github "SRGSSR/SRGMediaPlayer-iOS" "2.5.2"
 github "SRGSSR/libextobjc" "0.6_srg1"
 github "SRGSSR/srgcontentprotection-fake-ios" "1.1"
-github "SRGSSR/srgdataprovider-ios" "3240463717dc49b1d5d85daf76a1127ba14e94a9"
+github "SRGSSR/srgdataprovider-ios" "2f6bb0977626b105074ecc7822a407f63a21186e"
 github "SRGSSR/srgdiagnostics-ios" "1.0"
 github "SRGSSR/srglogger-ios" "1.0.7"
 github "SRGSSR/srgnetwork-ios" "0.2.1"

From f31354757a6ba465fd7b2aedb1859e01f01a50c9 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Bertholon <py.bertholon@gmail.com>
Date: Tue, 23 Oct 2018 17:01:15 +0200
Subject: [PATCH 11/13] Update dependencies

---
 Cartfile                 | 2 +-
 Cartfile.resolved.public | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cartfile b/Cartfile
index 6408120f..e0a8d9b6 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,4 +1,4 @@
-github "SRGSSR/srgdataprovider-ios" "2f6bb0977626b105074ecc7822a407f63a21186e"
+github "SRGSSR/srgdataprovider-ios" "339fe466540c29313702cf4dcaa7e8ca10be1db7"
 github "SRGSSR/SRGMediaPlayer-iOS" "2.5.2"
 github "SRGSSR/tagcommander-ios" "4.1.5_4.1.3"
 github "comScore/ComScore-iOS-SDK" "92f34897cd7659d56bb5a3e9e85b808cf3758bda"
\ No newline at end of file
diff --git a/Cartfile.resolved.public b/Cartfile.resolved.public
index f117e551..5c1dc593 100644
--- a/Cartfile.resolved.public
+++ b/Cartfile.resolved.public
@@ -3,7 +3,7 @@ github "SRGSSR/MAKVONotificationCenter" "1.0_srg2"
 github "SRGSSR/SRGMediaPlayer-iOS" "2.5.2"
 github "SRGSSR/libextobjc" "0.6_srg1"
 github "SRGSSR/srgcontentprotection-fake-ios" "1.1"
-github "SRGSSR/srgdataprovider-ios" "2f6bb0977626b105074ecc7822a407f63a21186e"
+github "SRGSSR/srgdataprovider-ios" "339fe466540c29313702cf4dcaa7e8ca10be1db7"
 github "SRGSSR/srgdiagnostics-ios" "1.0"
 github "SRGSSR/srglogger-ios" "1.0.7"
 github "SRGSSR/srgnetwork-ios" "0.2.1"

From e18f03c102795f925b70188015966c0450cfdbb2 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Bertholon <py.bertholon@gmail.com>
Date: Thu, 25 Oct 2018 22:57:58 +0200
Subject: [PATCH 12/13] Update dependencies

---
 Cartfile.resolved.proprietary | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cartfile.resolved.proprietary b/Cartfile.resolved.proprietary
index a7aa58ab..a81e4d93 100644
--- a/Cartfile.resolved.proprietary
+++ b/Cartfile.resolved.proprietary
@@ -3,7 +3,7 @@ github "SRGSSR/MAKVONotificationCenter" "1.0_srg2"
 github "SRGSSR/SRGMediaPlayer-iOS" "2.5.2"
 github "SRGSSR/libextobjc" "0.6_srg1"
 github "SRGSSR/srgcontentprotection-ios" "1.1"
-github "SRGSSR/srgdataprovider-ios" "2f6bb0977626b105074ecc7822a407f63a21186e"
+github "SRGSSR/srgdataprovider-ios" "339fe466540c29313702cf4dcaa7e8ca10be1db7"
 github "SRGSSR/srgdiagnostics-ios" "1.0"
 github "SRGSSR/srglogger-ios" "1.0.7"
 github "SRGSSR/srgnetwork-ios" "0.2.1"

From a094a987fabf997c9d94a763f04ce9ac42b21ac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20De=CC=81fago?= <defagos@gmail.com>
Date: Fri, 26 Oct 2018 15:17:16 +0200
Subject: [PATCH 13/13] Update dependencies

---
 Cartfile                      | 2 +-
 Cartfile.resolved.proprietary | 2 +-
 Cartfile.resolved.public      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cartfile b/Cartfile
index e0a8d9b6..51556937 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,4 +1,4 @@
-github "SRGSSR/srgdataprovider-ios" "339fe466540c29313702cf4dcaa7e8ca10be1db7"
+github "SRGSSR/srgdataprovider-ios" "6.3.1"
 github "SRGSSR/SRGMediaPlayer-iOS" "2.5.2"
 github "SRGSSR/tagcommander-ios" "4.1.5_4.1.3"
 github "comScore/ComScore-iOS-SDK" "92f34897cd7659d56bb5a3e9e85b808cf3758bda"
\ No newline at end of file
diff --git a/Cartfile.resolved.proprietary b/Cartfile.resolved.proprietary
index a81e4d93..ae7281a4 100644
--- a/Cartfile.resolved.proprietary
+++ b/Cartfile.resolved.proprietary
@@ -3,7 +3,7 @@ github "SRGSSR/MAKVONotificationCenter" "1.0_srg2"
 github "SRGSSR/SRGMediaPlayer-iOS" "2.5.2"
 github "SRGSSR/libextobjc" "0.6_srg1"
 github "SRGSSR/srgcontentprotection-ios" "1.1"
-github "SRGSSR/srgdataprovider-ios" "339fe466540c29313702cf4dcaa7e8ca10be1db7"
+github "SRGSSR/srgdataprovider-ios" "6.3.1"
 github "SRGSSR/srgdiagnostics-ios" "1.0"
 github "SRGSSR/srglogger-ios" "1.0.7"
 github "SRGSSR/srgnetwork-ios" "0.2.1"
diff --git a/Cartfile.resolved.public b/Cartfile.resolved.public
index 5c1dc593..299c7bc1 100644
--- a/Cartfile.resolved.public
+++ b/Cartfile.resolved.public
@@ -3,7 +3,7 @@ github "SRGSSR/MAKVONotificationCenter" "1.0_srg2"
 github "SRGSSR/SRGMediaPlayer-iOS" "2.5.2"
 github "SRGSSR/libextobjc" "0.6_srg1"
 github "SRGSSR/srgcontentprotection-fake-ios" "1.1"
-github "SRGSSR/srgdataprovider-ios" "339fe466540c29313702cf4dcaa7e8ca10be1db7"
+github "SRGSSR/srgdataprovider-ios" "6.3.1"
 github "SRGSSR/srgdiagnostics-ios" "1.0"
 github "SRGSSR/srglogger-ios" "1.0.7"
 github "SRGSSR/srgnetwork-ios" "0.2.1"