Skip to content

Commit

Permalink
Merge branch 'release/3.4.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
@defagos
defagos committed Sep 12, 2018
2 parents decb749 + cc27dbf commit d8ec851
Show file tree
Hide file tree
Showing 8 changed files with 59 additions and 33 deletions.
4 changes: 2 additions & 2 deletions Cartfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "SRGSSR/srgdataprovider-ios" "6.2"
github "SRGSSR/SRGMediaPlayer-iOS" "2.5"
github "SRGSSR/srgdataprovider-ios" "6.2.1"
github "SRGSSR/SRGMediaPlayer-iOS" "2.5.1"
github "SRGSSR/tagcommander-ios" "4.1.5_4.1.3"
github "comScore/ComScore-iOS-SDK" "92f34897cd7659d56bb5a3e9e85b808cf3758bda"
2 changes: 1 addition & 1 deletion Cartfile.private.proprietary
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "SRGSSR/srgcontentprotection-ios" "1.0"
github "SRGSSR/srgcontentprotection-ios" "1.0.1"
14 changes: 7 additions & 7 deletions Cartfile.resolved.proprietary
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
github "Mantle/Mantle" "2.1.0"
github "SRGSSR/MAKVONotificationCenter" "120fb5550aee8e9b4c92439bf34533020cc43c44"
github "SRGSSR/SRGMediaPlayer-iOS" "2.5"
github "SRGSSR/libextobjc" "80a882742fea920587df5c9377af68faa22be5d0"
github "SRGSSR/srgcontentprotection-ios" "1.0"
github "SRGSSR/srgdataprovider-ios" "6.2"
github "SRGSSR/srglogger-ios" "1.0.5"
github "SRGSSR/srgnetwork-ios" "0.1"
github "SRGSSR/MAKVONotificationCenter" "1.0_srg2"
github "SRGSSR/SRGMediaPlayer-iOS" "2.5.1"
github "SRGSSR/libextobjc" "0.6_srg1"
github "SRGSSR/srgcontentprotection-ios" "1.0.1"
github "SRGSSR/srgdataprovider-ios" "6.2.1"
github "SRGSSR/srglogger-ios" "1.0.6"
github "SRGSSR/srgnetwork-ios" "0.2"
github "SRGSSR/tagcommander-ios" "4.1.5_4.1.3"
github "comScore/ComScore-iOS-SDK" "92f34897cd7659d56bb5a3e9e85b808cf3758bda"
github "kif-framework/KIF" "v3.6.0"
12 changes: 6 additions & 6 deletions Cartfile.resolved.public
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
github "Mantle/Mantle" "2.1.0"
github "SRGSSR/MAKVONotificationCenter" "120fb5550aee8e9b4c92439bf34533020cc43c44"
github "SRGSSR/SRGMediaPlayer-iOS" "2.5"
github "SRGSSR/libextobjc" "80a882742fea920587df5c9377af68faa22be5d0"
github "SRGSSR/srgdataprovider-ios" "6.2"
github "SRGSSR/srglogger-ios" "1.0.5"
github "SRGSSR/srgnetwork-ios" "0.1"
github "SRGSSR/MAKVONotificationCenter" "1.0_srg2"
github "SRGSSR/SRGMediaPlayer-iOS" "2.5.1"
github "SRGSSR/libextobjc" "0.6_srg1"
github "SRGSSR/srgdataprovider-ios" "6.2.1"
github "SRGSSR/srglogger-ios" "1.0.6"
github "SRGSSR/srgnetwork-ios" "0.2"
github "SRGSSR/tagcommander-ios" "4.1.5_4.1.3"
github "comScore/ComScore-iOS-SDK" "92f34897cd7659d56bb5a3e9e85b808cf3758bda"
github "kif-framework/KIF" "v3.6.0"
20 changes: 20 additions & 0 deletions Framework/Resources/Info.plist
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
</dict>
</plist>
30 changes: 18 additions & 12 deletions SRGAnalytics.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@
088700C41DA2528900D4961A /* SimpleViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleViewController.h; sourceTree = "<group>"; };
088700C51DA2528900D4961A /* SimpleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SimpleViewController.m; sourceTree = "<group>"; };
08EB669B1F3352A300E9D7CA /* ComScoreViewEventTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ComScoreViewEventTests.m; sourceTree = "<group>"; };
6F00F7B72148DEF10016E664 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
6F04985A1F343C7A00E88BEC /* SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SRGMediaPlayerController+SRGAnalytics_MediaPlayer.h"; sourceTree = "<group>"; };
6F04985B1F343C7A00E88BEC /* SRGMediaPlayerController+SRGAnalytics_MediaPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "SRGMediaPlayerController+SRGAnalytics_MediaPlayer.m"; sourceTree = "<group>"; };
6F04985C1F343C7A00E88BEC /* SRGAnalyticsMediaPlayerLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SRGAnalyticsMediaPlayerLogger.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -500,6 +501,14 @@
path = Simple;
sourceTree = "<group>";
};
6F00F7B62148DEF10016E664 /* Resources */ = {
isa = PBXGroup;
children = (
6F00F7B72148DEF10016E664 /* Info.plist */,
);
path = Resources;
sourceTree = "<group>";
};
6F0498591F343C7A00E88BEC /* Categories */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -726,6 +735,7 @@
isa = PBXGroup;
children = (
E69A202F1D61E5E80064E6C1 /* Sources */,
6F00F7B62148DEF10016E664 /* Resources */,
E69A202E1D61E5E80064E6C1 /* Info.plist */,
);
path = Framework;
Expand Down Expand Up @@ -1280,7 +1290,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MARKETING_VERSION = 3.4;
MARKETING_VERSION = 3.4.1;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
};
Expand Down Expand Up @@ -1473,7 +1483,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MARKETING_VERSION = 3.4;
MARKETING_VERSION = 3.4.1;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
};
Expand Down Expand Up @@ -1633,9 +1643,8 @@
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_BITCODE = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = Framework/Info.plist;
INFOPLIST_FILE = Framework/Resources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
MTL_ENABLE_DEBUG_INFO = YES;
PRODUCT_BUNDLE_IDENTIFIER = "ch.srgssr.SRGAnalytics-resources";
Expand All @@ -1656,9 +1665,8 @@
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_BITCODE = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = Framework/Info.plist;
INFOPLIST_FILE = Framework/Resources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
MTL_ENABLE_DEBUG_INFO = YES;
PRODUCT_BUNDLE_IDENTIFIER = "ch.srgssr.SRGAnalytics-resources";
Expand All @@ -1679,9 +1687,8 @@
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_BITCODE = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = Framework/Info.plist;
INFOPLIST_FILE = Framework/Resources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = "ch.srgssr.SRGAnalytics-resources";
Expand All @@ -1702,9 +1709,8 @@
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_BITCODE = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = Framework/Info.plist;
INFOPLIST_FILE = Framework/Resources/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = "ch.srgssr.SRGAnalytics-resources";
Expand Down Expand Up @@ -1813,7 +1819,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MARKETING_VERSION = 3.4;
MARKETING_VERSION = 3.4.1;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
};
Expand Down Expand Up @@ -1863,7 +1869,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MARKETING_VERSION = 3.4;
MARKETING_VERSION = 3.4.1;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
};
Expand Down
4 changes: 2 additions & 2 deletions Tests/Sources/ComScoreDataProviderTestCase.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,15 @@ - (void)testPlaySegmentInMediaComposition
// Use a segment id as video id, expect segment labels
[self expectationForComScoreHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
XCTAssertEqualObjects(labels[@"ns_st_ev"], @"play");
XCTAssertEqualObjects(labels[@"ns_st_ep"], @"Newsflash");
XCTAssertEqualObjects(labels[@"ns_st_ep"], @"Der Neue ist der Alte");
XCTAssertEqualObjects(labels[@"srg_mqual"], @"HD");
return YES;
}];

SRGDataProvider *dataProvider = [[SRGDataProvider alloc] initWithServiceURL:ServiceTestURL()];

__block SRGMediaComposition *fetchedMediaComposition = nil;
[[dataProvider mediaCompositionForURN:@"urn:srf:video:985aa94a-587c-494e-b484-3cd746032264" standalone:NO withCompletionBlock:^(SRGMediaComposition * _Nullable mediaComposition, NSHTTPURLResponse * _Nullable HTTPResponse, NSError * _Nullable error) {
[[dataProvider mediaCompositionForURN:@"urn:srf:video:84043ead-6e5a-4a05-875c-c1aa2998aa43" standalone:NO withCompletionBlock:^(SRGMediaComposition * _Nullable mediaComposition, NSHTTPURLResponse * _Nullable HTTPResponse, NSError * _Nullable error) {
XCTAssertNotNil(mediaComposition);
fetchedMediaComposition = mediaComposition;

Expand Down
6 changes: 3 additions & 3 deletions Tests/Sources/DataProviderTestCase.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,16 +143,16 @@ - (void)testPlaySegmentInMediaComposition
// Use a segment id as video id, expect segment labels
[self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) {
XCTAssertEqualObjects(labels[@"event_id"], @"play");
XCTAssertEqualObjects(labels[@"media_segment"], @"Newsflash");
XCTAssertEqualObjects(labels[@"media_segment"], @"Der Neue ist der Alte");
XCTAssertEqualObjects(labels[@"media_streaming_quality"], @"HD");
XCTAssertEqualObjects(labels[@"media_urn"], @"urn:srf:video:985aa94a-587c-494e-b484-3cd746032264");
XCTAssertEqualObjects(labels[@"media_urn"], @"urn:srf:video:84043ead-6e5a-4a05-875c-c1aa2998aa43");
return YES;
}];

SRGDataProvider *dataProvider = [[SRGDataProvider alloc] initWithServiceURL:ServiceTestURL()];

__block SRGMediaComposition *fetchedMediaComposition = nil;
[[dataProvider mediaCompositionForURN:@"urn:srf:video:985aa94a-587c-494e-b484-3cd746032264" standalone:NO withCompletionBlock:^(SRGMediaComposition * _Nullable mediaComposition, NSHTTPURLResponse * _Nullable HTTPResponse, NSError * _Nullable error) {
[[dataProvider mediaCompositionForURN:@"urn:srf:video:84043ead-6e5a-4a05-875c-c1aa2998aa43" standalone:NO withCompletionBlock:^(SRGMediaComposition * _Nullable mediaComposition, NSHTTPURLResponse * _Nullable HTTPResponse, NSError * _Nullable error) {
XCTAssertNotNil(mediaComposition);
fetchedMediaComposition = mediaComposition;

Expand Down

0 comments on commit d8ec851

Please sign in to comment.