Merge branch 'release/2.4.2'

SRGSSR · Jun 5, 2018 · 98f1300 · 98f1300
2 parents b0e4196 + 59d1eb0
commit 98f1300
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1,3 +1,3 @@
 github "SRGSSR/libextobjc" "46f179fbba8dde2a3eb3da284919789b78aac441"
 github "SRGSSR/MAKVONotificationCenter" "d5af67218b3b7b49660a43edef5e6eb9c437d670"
-github "SRGSSR/srglogger-ios" "1.0.2"
+github "SRGSSR/srglogger-ios" "1.0.3"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,3 +1,3 @@
 github "SRGSSR/MAKVONotificationCenter" "d5af67218b3b7b49660a43edef5e6eb9c437d670"
 github "SRGSSR/libextobjc" "46f179fbba8dde2a3eb3da284919789b78aac441"
-github "SRGSSR/srglogger-ios" "1.0.2"
+github "SRGSSR/srglogger-ios" "1.0.3"
diff --git a/Framework/Resources/it.lproj/Accessibility.strings b/Framework/Resources/it.lproj/Accessibility.strings
@@ -1,5 +1,5 @@
 /* Slider label when playing a DVR in the past */
-"%@ from live" = "%@ live";
+"%@ from live" = "%@ dal live";
 
 /* Label on slider for time elapsed */
 "%@ played" = "%@ riprodotto";

diff --git a/SRGMediaPlayer.xcodeproj/project.pbxproj b/SRGMediaPlayer.xcodeproj/project.pbxproj
@@ -927,7 +927,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = SRG;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = "SRG SSR";
 				TargetAttributes = {
 					E69A1DA81D61B9380064E6C1 = {
@@ -1205,7 +1205,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MARKETING_VERSION = 2.4.1;
+				MARKETING_VERSION = 2.4.2;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1255,7 +1255,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MARKETING_VERSION = 2.4.1;
+				MARKETING_VERSION = 2.4.2;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;

diff --git a/SRGMediaPlayer.xcodeproj/xcshareddata/xcschemes/SRGMediaPlayer.xcscheme b/SRGMediaPlayer.xcodeproj/xcshareddata/xcschemes/SRGMediaPlayer.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Tests/Sources/PlaybackTestCase.m b/Tests/Sources/PlaybackTestCase.m
@@ -830,9 +830,9 @@ - (void)testOnDemandProperties
 
 - (void)testLiveProperties
 {
-    // FIXME: See https://github.com/SRGSSR/SRGMediaPlayer-iOS/issues/50. Workaround so that the test passes on iOS 11.3.
+    // FIXME: See https://github.com/SRGSSR/SRGMediaPlayer-iOS/issues/50. Workaround so that the test passes on iOS >= 11.3.
     NSOperatingSystemVersion operatingSystemVersion = [NSProcessInfo processInfo].operatingSystemVersion;
-    if (operatingSystemVersion.majorVersion == 11 && operatingSystemVersion.minorVersion == 3) {
+    if (operatingSystemVersion.majorVersion == 11 && operatingSystemVersion.minorVersion >= 3) {
         self.mediaPlayerController.minimumDVRWindowLength = 40.;
     }