Merge branch 'release/ios/3.1.3-343'

Application/Resources/Images/CommonImages.xcassets/Error Icons/rating_12-25.imageset/Contents.json → Application/Resources/Images/CommonImages.xcassets/Error Icons/age_rating-25.imageset/Contents.json

@@ -1,15 +1,15 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "forbidden-12.pdf"
+      "filename" : "NightTime25.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "template-rendering-intent" : "template"
   }
-}
+}

Application/Resources/Settings.bundle/com.mono0926.LicensePlist.latest_result.txt

@@ -434,7 +434,7 @@ name: appcenter-sdk-apple, nameSpecified: , owner: microsoft, version: 3.3.4
 
 name: CoconutKit, nameSpecified: , owner: defagos, version: 3.4
 
-name: ComScore-iOS-watchOS-tvOS, nameSpecified: , owner: SRGSSR, version: 6.3.1
+name: ComScore-iOS-watchOS-tvOS, nameSpecified: , owner: SRGSSR, version: 6.6.0
 
 name: DZNEmptyDataSet, nameSpecified: , owner: SRGSSR, version: v1.8.1_srg1
 
@@ -450,7 +450,7 @@ name: Mantle, nameSpecified: , owner: Mantle, version: 2.1.2
 
 name: Masonry, nameSpecified: , owner: SRGSSR, version: v1.1.0_srg1
 
-name: srganalytics-apple, nameSpecified: , owner: SRGSSR, version: 4.2.2
+name: srganalytics-apple, nameSpecified: , owner: SRGSSR, version: 4.2.3
 
 name: srgappearance-apple, nameSpecified: , owner: SRGSSR, version: 2.1.0
 
@@ -462,7 +462,7 @@ name: srgdiagnostics-apple, nameSpecified: , owner: SRGSSR, version: 2.0.1
 
 name: srgidentity-apple, nameSpecified: , owner: SRGSSR, version: 2.0.4
 
-name: srgletterbox-apple, nameSpecified: , owner: SRGSSR, version: 5.0.2
+name: srgletterbox-apple, nameSpecified: , owner: SRGSSR, version: 5.0.3
 
 name: srglogger-apple, nameSpecified: , owner: SRGSSR, version: 2.0.1
 

Application/Resources/Settings.bundle/com.mono0926.LicensePlist.plist

@@ -54,7 +54,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/ComScore-iOS-watchOS-tvOS</string>
 			<key>Title</key>
-			<string>ComScore-iOS-watchOS-tvOS (6.3.1)</string>
+			<string>ComScore-iOS-watchOS-tvOS (6.6.0)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@@ -254,7 +254,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/srganalytics-apple</string>
 			<key>Title</key>
-			<string>srganalytics-apple (4.2.2)</string>
+			<string>srganalytics-apple (4.2.3)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@@ -302,7 +302,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/srgletterbox-apple</string>
 			<key>Title</key>
-			<string>srgletterbox-apple (5.0.2)</string>
+			<string>srgletterbox-apple (5.0.3)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>

Application/Sources/Helpers/Categories/UIImage+PlaySRG.m

@@ -92,13 +92,9 @@ + (UIImage *)play_imageForBlockingReason:(SRGBlockingReason)blockingReason
             break;
         }
 
-        case SRGBlockingReasonAgeRating12: {
-            return [UIImage imageNamed:@"rating_12-25"];
-            break;
-        }
-
+        case SRGBlockingReasonAgeRating12:
         case SRGBlockingReasonAgeRating18: {
-            return [UIImage imageNamed:@"rating_18-25"];
+            return [UIImage imageNamed:@"age_rating-25"];
             break;
         }
 

Cartfile

@@ -6,5 +6,5 @@ github "microsoft/appcenter-sdk-apple" ~> 3.1.0
 github "SRGSSR/DZNEmptyDataSet" "v1.8.1_srg1"
 github "SRGSSR/Masonry" "v1.1.0_srg1"
 github "urbanairship/ios-library" ~> 13.3.2
-github "SRGSSR/srgletterbox-apple" "5.0.2"
+github "SRGSSR/srgletterbox-apple" "5.0.3"
 github "SRGSSR/srguserdata-apple" "2.0.4"

Cartfile.resolved.proprietary

@@ -1,21 +1,21 @@
 github "Flipboard/FLEX" "4.1.1"
 github "IdeasOnCanvas/Aiolos" "1.3.0"
 github "Mantle/Mantle" "2.1.2"
-github "SRGSSR/ComScore-iOS-watchOS-tvOS" "6.3.1"
+github "SRGSSR/ComScore-iOS-watchOS-tvOS" "6.6.0"
 github "SRGSSR/DZNEmptyDataSet" "v1.8.1_srg1"
 github "SRGSSR/FXReachability" "1.3.2_srg4"
 github "SRGSSR/MAKVONotificationCenter" "1.0_srg4"
 github "SRGSSR/Masonry" "v1.1.0_srg1"
 github "SRGSSR/UICKeyChainStore" "v2.1.2_srg1"
 github "SRGSSR/YYWebImage" "1.0.5_srg2"
 github "SRGSSR/libextobjc" "0.6_srg2"
-github "SRGSSR/srganalytics-apple" "4.2.2"
+github "SRGSSR/srganalytics-apple" "4.2.3"
 github "SRGSSR/srgappearance-apple" "2.1.0"
 github "SRGSSR/srgcontentprotection-apple" "2.0.2"
 github "SRGSSR/srgdataprovider-apple" "8.0.1"
 github "SRGSSR/srgdiagnostics-apple" "2.0.1"
 github "SRGSSR/srgidentity-apple" "2.0.4"
-github "SRGSSR/srgletterbox-apple" "5.0.2"
+github "SRGSSR/srgletterbox-apple" "5.0.3"
 github "SRGSSR/srglogger-apple" "2.0.1"
 github "SRGSSR/srgmediaplayer-apple" "5.0.3"
 github "SRGSSR/srgnetwork-apple" "2.0.2"

Cartfile.resolved.public

@@ -1,21 +1,21 @@
 github "Flipboard/FLEX" "4.1.1"
 github "IdeasOnCanvas/Aiolos" "1.3.0"
 github "Mantle/Mantle" "2.1.2"
-github "SRGSSR/ComScore-iOS-watchOS-tvOS" "6.3.1"
+github "SRGSSR/ComScore-iOS-watchOS-tvOS" "6.6.0"
 github "SRGSSR/DZNEmptyDataSet" "v1.8.1_srg1"
 github "SRGSSR/FXReachability" "1.3.2_srg4"
 github "SRGSSR/MAKVONotificationCenter" "1.0_srg4"
 github "SRGSSR/Masonry" "v1.1.0_srg1"
 github "SRGSSR/UICKeyChainStore" "v2.1.2_srg1"
 github "SRGSSR/YYWebImage" "1.0.5_srg2"
 github "SRGSSR/libextobjc" "0.6_srg2"
-github "SRGSSR/srganalytics-apple" "4.2.2"
+github "SRGSSR/srganalytics-apple" "4.2.3"
 github "SRGSSR/srgappearance-apple" "2.1.0"
 github "SRGSSR/srgcontentprotection-fake-apple" "2.0.2"
 github "SRGSSR/srgdataprovider-apple" "8.0.1"
 github "SRGSSR/srgdiagnostics-apple" "2.0.1"
 github "SRGSSR/srgidentity-apple" "2.0.4"
-github "SRGSSR/srgletterbox-apple" "5.0.2"
+github "SRGSSR/srgletterbox-apple" "5.0.3"
 github "SRGSSR/srglogger-apple" "2.0.1"
 github "SRGSSR/srgmediaplayer-apple" "5.0.3"
 github "SRGSSR/srgnetwork-apple" "2.0.2"

PlaySRG.xcodeproj/project.pbxproj

@@ -7471,7 +7471,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 342;
+				CURRENT_PROJECT_VERSION = 343;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -7490,7 +7490,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 3.1.2;
+				MARKETING_VERSION = 3.1.3;
 				MARKETING_VERSION_SUFFIX = "-debug";
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -7539,7 +7539,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 342;
+				CURRENT_PROJECT_VERSION = 343;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -7552,7 +7552,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 3.1.2;
+				MARKETING_VERSION = 3.1.3;
 				MARKETING_VERSION_SUFFIX = "";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
@@ -7884,7 +7884,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 342;
+				CURRENT_PROJECT_VERSION = 343;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -7898,7 +7898,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 3.1.2;
+				MARKETING_VERSION = 3.1.3;
 				MARKETING_VERSION_SUFFIX = "-beta";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
@@ -8091,7 +8091,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 342;
+				CURRENT_PROJECT_VERSION = 343;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -8105,7 +8105,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 3.1.2;
+				MARKETING_VERSION = 3.1.3;
 				MARKETING_VERSION_SUFFIX = "-nightly";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;

WhatsNew-beta.json

@@ -118,5 +118,6 @@
   "3.1.1-339": "- Always hide the playback controls after entering full screen.\n- Fix screen incorrectly turning off when watching videos with sound over AirPlay.\n- Fix issue leading to the loading indicator being displayed more than necessary.\n- iPad profile split view: Reset right navigation to its root when tapping again on left cells.",
   "3.1.1-340": "- Updated TV and radio channel overview on the Live tab. \n- Add \"sort by\" filter in Search tab.\n- iOS prediction for TV and radio livestreams.",
   "3.1.1-341": "- Correctly take into account SDH accessibility opt-in when choosing subtitles automatically.",
-  "3.1.2-342": "- Fix an iOS 14 regression leading to the player still continuing playback of a video in the background, even after having been properly released."
+  "3.1.2-342": "- Fix an iOS 14 regression leading to the player still continuing playback of a video in the background, even after having been properly released.",
+  "3.1.3-343": "- Age rating icons have been replaced with a generic one without reference to FSK ratings.\n- Update measurement components for iOS 14."
 }

docs/RELEASE_CHECKLIST.md

@@ -7,21 +7,23 @@
 | Verify that Cartfile.resolved only contains tagged versions ||||||
 | Perform global diff with last release ||||||
 | Submit what's new for translation ||||||
-| Collect translated what's new ||||||
 | Start git-flow release branch for new version ||||||
 | Check version and build numbers. Bump if needed ||||||
-| Update what's new JSON ||||||
+| Update what's new JSON for betas ||||||
 | Update what's new on Pastebin (mark new release with the _preprod_ flag) ||||||
-| Create new version on iTunes Connect with what's new information ||||||
+| Create new version on AppStore Connect with what's new information ||||||
+| Collect translated what's new and update Pastbin and AppStore Connect ||||||
 | Update screenshots if needed (with fastlane) ||||||
 | Build betas for AppCenter (with fastlane on TeamCity) ||||||
-| Check what's new in AppCenter betas ||||||
-| Write test ticket and alert testers on Slack ||||||
+| Build versions for AppStore Connect (with fastlane on TeamCity) ||||||
+| Wait until the binary has been validated on AppStore Connect ||||||
+| Collect DSYMs and upload it on AppCenter (with fastlane) ||||||
 | Update production remote configuration on Firebase ||||||
-| Build versions for iTunes Connect (with fastlane) ||||||
-| Wait until the binary has been validated on iTunes Connect ||||||
-| Get the binary DSYM and upload it on AppCenter (with fastlane) ||||||
-| Ask the BU to approve the version ||||||
+| Publish TestFlight versions on AppStore Connect ||||||
+| Check what's new in AppCenter betas or TestFlight versions ||||||
+| Ask the PO to approve the version ||||||
+| Submit to Apple review ||||||
+| Update status page on Confluence ||||||
 | Obtain successful Apple review ||||||
 | Release to the store ||||||
 | Check that the application is available in production ||||||