Merge branch 'release/8.1.0'

SRGSSR · Jun 15, 2022 · 5f5aa8e · 5f5aa8e
2 parents 5d0d479 + f375f14
commit 5f5aa8e
Show file tree

Hide file tree

Showing 24 changed files with 138 additions and 80 deletions.
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/SRGLetterbox.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/SRGLetterbox.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1330"
+   LastUpgradeVersion = "1340"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -69,6 +69,9 @@
                <Test
                   Identifier = "SwissTXTTestCase/testSkipToLiveForSwissTXTFullDVRStream">
                </Test>
+               <Test
+                  Identifier = "SwissTXTTestCase/testSkipToLiveForSwissTXTLimitedDVRStream">
+               </Test>
                <Test
                   Identifier = "SwissTXTTestCase/testSwissTXTFullDVRNotYetAvailable">
                </Test>

diff --git a/Demo/Resources/MediaDemoConfiguration.plist b/Demo/Resources/MediaDemoConfiguration.plist
@@ -108,7 +108,7 @@
 				</dict>
 				<dict>
 					<key>name</key>
-					<string>RTS Info DVR</string>
+					<string>RTS Info LIVE</string>
 					<key>urn</key>
 					<string>urn:rts:video:1967124</string>
 				</dict>
@@ -154,102 +154,102 @@
 			<key>name</key>
 			<string>Scheduled livestreams</string>
 			<key>summary</key>
-			<string>Simulated scheduled livestreams, like those supplied by SwissTXT for sports events.</string>
+			<string>Simulated scheduled livestreams, like those supplied by SwissTXT for sports events and LSVE for events.</string>
 			<key>medias</key>
 			<array>
 				<dict>
 					<key>name</key>
-					<string>SwissTXT Full DVR</string>
+					<string>LiveCenter Full DVR</string>
 					<key>urn</key>
-					<string>urn:rts:video:_rts_info_fulldvr</string>
+					<string>urn:rts:video:_couleur3_fulldvr</string>
 					<key>service</key>
 					<string>mmf</string>
 				</dict>
 				<dict>
 					<key>name</key>
-					<string>SwissTXT Limited DVR</string>
+					<string>LiveCenter Limited DVR</string>
 					<key>urn</key>
-					<string>urn:rts:video:_rts_info_liveonly_limiteddvr</string>
+					<string>urn:rts:video:_couleur3_liveonly_limiteddvr</string>
 					<key>service</key>
 					<string>mmf</string>
 				</dict>
 				<dict>
 					<key>name</key>
-					<string>SwissTXT Live Only</string>
+					<string>LiveCenter Live Only</string>
 					<key>urn</key>
-					<string>urn:rts:video:_rts_info_liveonly_delay</string>
+					<string>urn:rts:video:_couleur3_liveonly_delay</string>
 					<key>service</key>
 					<string>mmf</string>
 				</dict>
 				<dict>
 					<key>name</key>
 					<string>Scheduled livestream (100 days transition)</string>
 					<key>urn</key>
-					<string>urn:rts:video:_rts_info_delay_100DAYS_</string>
+					<string>urn:rts:video:_couleur3_delay_100DAYS_</string>
 					<key>service</key>
 					<string>mmf</string>
 				</dict>
 				<dict>
 					<key>name</key>
 					<string>Scheduled livestream</string>
 					<key>urn</key>
-					<string>urn:rts:video:_rts_info_delay</string>
+					<string>urn:rts:video:_couleur3_delay</string>
 					<key>service</key>
 					<string>mmf</string>
 				</dict>
 				<dict>
 					<key>name</key>
 					<string>Scheduled livestream (1 day transition)</string>
 					<key>urn</key>
-					<string>urn:rts:video:_rts_info_delay_1DAY_</string>
+					<string>urn:rts:video:_couleur3_delay_1DAY_</string>
 					<key>service</key>
 					<string>mmf</string>
 				</dict>
 				<dict>
 					<key>name</key>
 					<string>Scheduled livestream (1 hour transition)</string>
 					<key>urn</key>
-					<string>urn:rts:video:_rts_info_delay_1HOUR_</string>
+					<string>urn:rts:video:_couleur3_delay_1HOUR_</string>
 					<key>service</key>
 					<string>mmf</string>
 				</dict>
 				<dict>
 					<key>name</key>
 					<string>Scheduled livestream (start)</string>
 					<key>urn</key>
-					<string>urn:rts:video:_rts_info_delay_START_</string>
+					<string>urn:rts:video:_couleur3_delay_START_</string>
 					<key>service</key>
 					<string>mmf</string>
 				</dict>
 				<dict>
 					<key>name</key>
 					<string>Scheduled livestream (soon expired)</string>
 					<key>urn</key>
-					<string>urn:rts:video:_rts_info_delay_SOON_EXPIRED_</string>
+					<string>urn:rts:video:_couleur3_delay_SOON_EXPIRED_</string>
 					<key>service</key>
 					<string>mmf</string>
 				</dict>
 				<dict>
 					<key>name</key>
 					<string>Scheduled livestream with server cache</string>
 					<key>urn</key>
-					<string>urn:rts:video:_rts_info_cacheddelay</string>
+					<string>urn:rts:video:_couleur3_cacheddelay</string>
 					<key>service</key>
 					<string>mmf</string>
 				</dict>
 				<dict>
 					<key>name</key>
 					<string>Scheduled livestream never playable</string>
 					<key>urn</key>
-					<string>urn:rts:video:_rts_info_never</string>
+					<string>urn:rts:video:_couleur3_never</string>
 					<key>service</key>
 					<string>mmf</string>
 				</dict>
 				<dict>
 					<key>name</key>
 					<string>SwissTXT Full DVR with start date change</string>
 					<key>urn</key>
-					<string>urn:rts:video:_rts_info_fulldvrstartdate</string>
+					<string>urn:rts:video:_couleur3_fulldvrstartdate</string>
 					<key>service</key>
 					<string>mmf</string>
 				</dict>
@@ -278,23 +278,23 @@
 					<key>name</key>
 					<string>Temporary geoblocking</string>
 					<key>urn</key>
-					<string>urn:rts:video:_rts_info_geoblocked</string>
+					<string>urn:rts:video:_couleur3_geoblocked</string>
 					<key>service</key>
 					<string>mmf</string>
 				</dict>
 				<dict>
 					<key>name</key>
 					<string>Temporary live-only restriction</string>
 					<key>urn</key>
-					<string>urn:rts:video:_rts_info_killswitch</string>
+					<string>urn:rts:video:_couleur3_killswitch</string>
 					<key>service</key>
 					<string>mmf</string>
 				</dict>
 				<dict>
 					<key>name</key>
 					<string>Temporarily not found</string>
 					<key>urn</key>
-					<string>urn:rts:video:_rts_info_notfound</string>
+					<string>urn:rts:video:_couleur3_notfound</string>
 					<key>service</key>
 					<string>mmf</string>
 				</dict>

diff --git a/Demo/SRGLetterbox-demo.xcodeproj/project.pbxproj b/Demo/SRGLetterbox-demo.xcodeproj/project.pbxproj
@@ -390,7 +390,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = SRG;
-				LastUpgradeCheck = 1330;
+				LastUpgradeCheck = 1340;
 				ORGANIZATIONNAME = "SRG SSR";
 				TargetAttributes = {
 					6FAB3B391E28FE2000CC2197 = {

diff --git a/Demo/SRGLetterbox-demo.xcodeproj/xcshareddata/xcschemes/SRGLetterbox-demo.xcscheme b/Demo/SRGLetterbox-demo.xcodeproj/xcshareddata/xcschemes/SRGLetterbox-demo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1330"
+   LastUpgradeVersion = "1340"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Demo/SRGLetterbox-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Demo/SRGLetterbox-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -78,8 +78,8 @@
         "repositoryURL": "https://github.com/SRGSSR/srganalytics-apple.git",
         "state": {
           "branch": null,
-          "revision": "5df56e21e23ffab0e7c8f374f440d6800227e985",
-          "version": "7.6.0"
+          "revision": "d0de40a67e2fb29765205620603b7e0b2973821b",
+          "version": "7.7.0"
         }
       },
       {
@@ -105,8 +105,8 @@
         "repositoryURL": "https://github.com/SRGSSR/srgdataprovider-apple.git",
         "state": {
           "branch": null,
-          "revision": "cf802c734d42a5a40200ad21015524093b12f7bf",
-          "version": "14.0.0"
+          "revision": "d492e3b7c7ef6b4d4a9c37721897115fb5030dd0",
+          "version": "15.0.0"
         }
       },
       {

diff --git a/Demo/Xcode/Shared/Targets/Application.xcconfig b/Demo/Xcode/Shared/Targets/Application.xcconfig
@@ -1,8 +1,8 @@
 #include "Xcode/Shared/Common.xcconfig"
 
 // Version information
-MARKETING_VERSION = 8.0.0
-CURRENT_PROJECT_VERSION = 93
+MARKETING_VERSION = 8.1.0
+CURRENT_PROJECT_VERSION = 95
 
 // Deployment targets
 IPHONEOS_DEPLOYMENT_TARGET = 12.0

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -8,20 +8,20 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.554.0)
-    aws-sdk-core (3.126.0)
+    aws-partitions (1.597.0)
+    aws-sdk-core (3.131.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.54.0)
-      aws-sdk-core (~> 3, >= 3.126.0)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.57.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.112.0)
-      aws-sdk-core (~> 3, >= 3.126.0)
+    aws-sdk-s3 (1.114.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.0.3)
@@ -36,8 +36,8 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
     emoji_regex (3.2.3)
-    excon (0.91.0)
-    faraday (1.9.3)
+    excon (0.92.3)
+    faraday (1.10.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -56,8 +56,8 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
@@ -66,7 +66,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.6)
-    fastlane (2.204.3)
+    fastlane (2.206.2)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -108,9 +108,9 @@ GEM
     fastlane-plugin-appcenter (2.0.0)
     fastlane-plugin-xcconfig (2.0.0)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.16.0)
+    google-apis-androidpublisher_v3 (0.21.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.4.2)
+    google-apis-core (0.5.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -123,36 +123,36 @@ GEM
       google-apis-core (>= 0.4, < 2.a)
     google-apis-playcustomapp_v1 (0.7.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.11.0)
+    google-apis-storage_v1 (0.14.0)
       google-apis-core (>= 0.4, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.5.0)
-      faraday (>= 0.17.3, < 2.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
     google-cloud-errors (1.2.0)
-    google-cloud-storage (1.36.1)
+    google-cloud-storage (1.36.2)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
       google-apis-storage_v1 (~> 0.1)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.1.1)
-      faraday (>= 0.17.3, < 2.0)
+    googleauth (1.1.3)
+      faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    jmespath (1.6.0)
-    json (2.6.1)
-    jwt (2.3.0)
+    jmespath (1.6.1)
+    json (2.6.2)
+    jwt (2.4.1)
     memoist (0.16.2)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
@@ -163,9 +163,9 @@ GEM
     optparse (0.1.1)
     os (1.1.4)
     plist (3.6.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     rake (13.0.6)
-    representable (3.1.1)
+    representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
@@ -175,9 +175,9 @@ GEM
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     security (0.1.3)
-    signet (0.16.0)
+    signet (0.16.1)
       addressable (~> 2.8)
-      faraday (>= 0.17.3, < 2.0)
+      faraday (>= 0.17.5, < 3.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     simctl (1.6.8)
@@ -194,7 +194,7 @@ GEM
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
+    unf_ext (0.0.8.2)
     unicode-display_width (1.8.0)
     webrick (1.7.0)
     word_wrap (1.0.0)

diff --git a/Package.resolved b/Package.resolved
@@ -60,8 +60,8 @@
         "repositoryURL": "https://github.com/SRGSSR/srganalytics-apple.git",
         "state": {
           "branch": null,
-          "revision": "5df56e21e23ffab0e7c8f374f440d6800227e985",
-          "version": "7.6.0"
+          "revision": "d0de40a67e2fb29765205620603b7e0b2973821b",
+          "version": "7.7.0"
         }
       },
       {
@@ -87,8 +87,8 @@
         "repositoryURL": "https://github.com/SRGSSR/srgdataprovider-apple.git",
         "state": {
           "branch": null,
-          "revision": "cf802c734d42a5a40200ad21015524093b12f7bf",
-          "version": "14.0.0"
+          "revision": "d492e3b7c7ef6b4d4a9c37721897115fb5030dd0",
+          "version": "15.0.0"
         }
       },
       {