Merge branch 'release/7.0.2'

SRGSSR · Jul 8, 2022 · d97e453 · d97e453
2 parents b0a28e8 + c0ef31d
commit d97e453
Show file tree

Hide file tree

Showing 13 changed files with 274 additions and 87 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,6 @@ xcuserdata
 /fastlane/*.xml
 
 /vendor
-/.bundle
+/.bundle
+
+.vscode
diff --git a/Demo/Demo.xcconfig b/Demo/Demo.xcconfig
@@ -1,5 +1,5 @@
 // Version information
-MARKETING_VERSION = 7.0.1
+MARKETING_VERSION = 7.0.2
 
 // Deployment targets
 IPHONEOS_DEPLOYMENT_TARGET = 9.0

diff --git a/Demo/Resources/Data/MultiPlayerDemoConfiguration.plist b/Demo/Resources/Data/MultiPlayerDemoConfiguration.plist
@@ -14,7 +14,7 @@
 			<key>name</key>
 			<string>Livestream</string>
 			<key>url</key>
-			<string>https://rtsc3video-lh.akamaihd.net/i/rtsc3video_ww@513975/master.m3u8?dw=0</string>
+			<string>https://rtsc3video.akamaized.net/hls/live/2042837/c3video/3/playlist.m3u8?dw=0</string>
 		</dict>
 		<dict>
 			<key>name</key>

diff --git a/Demo/Resources/Data/SegmentDemoConfiguration.plist b/Demo/Resources/Data/SegmentDemoConfiguration.plist
@@ -363,7 +363,7 @@
 			<key>name</key>
 			<string>Segments in DVR stream</string>
 			<key>url</key>
-			<string>https://rtsc3video-lh.akamaihd.net/i/rtsc3video_ww@513975/master.m3u8</string>
+			<string>https://rtsc3video.akamaized.net/hls/live/2042837/c3video/3/playlist.m3u8</string>
 			<key>segments</key>
 			<array>
 				<dict>

diff --git a/Demo/Resources/Data/VideoDemoConfiguration.plist b/Demo/Resources/Data/VideoDemoConfiguration.plist
@@ -8,13 +8,13 @@
 			<key>name</key>
 			<string>Livestream</string>
 			<key>url</key>
-			<string>https://rtsc3video-lh.akamaihd.net/i/rtsc3video_ww@513975/master.m3u8?dw=0</string>
+			<string>https://rtsc3video.akamaized.net/hls/live/2042837/c3video/3/playlist.m3u8?dw=0</string>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Livestream with DVR</string>
 			<key>url</key>
-			<string>https://rtsc3video-lh.akamaihd.net/i/rtsc3video_ww@513975/master.m3u8</string>
+			<string>https://rtsc3video.akamaized.net/hls/live/2042837/c3video/3/playlist.m3u8</string>
 		</dict>
 		<dict>
 			<key>name</key>
@@ -62,7 +62,7 @@
 			<key>name</key>
 			<string>How women are taking on the Cresta Run</string>
 			<key>url</key>
-			<string>https://srgplayerswivod-vh.akamaihd.net/i/44785866/,video,.mp4.csmil/master.m3u8</string>
+			<string>https://swi-vod.akamaized.net/videoJson/44785866/master.m3u8</string>
 		</dict>
 		<dict>
 			<key>name</key>
@@ -82,7 +82,7 @@
 		</dict>
 		<dict>
 			<key>name</key>
-			<string>10vor10 subject with buggy subtitles (Akamai issue)</string>
+			<string>10vor10 subject with buggy subtitles (Akamai MLS 3 issue)</string>
 			<key>url</key>
 			<string>https://hdvodsrforigins3-vh.akamaihd.net/i/assets/video/10vor10/2020/06/10vor10_20200610_215034_21058070_v_webcast_h264_,q40,q10,q20,q30,q50,.mp4.csmil/master.m3u8?start=66.4&amp;end=554.52&amp;caption=srf%2F26a1de9a-7b3e-460f-a3c2-24421b00217a%2Fepisode%2Fde%2Fvod%2Fvod.m3u8%3Ade%3ADeutsch%3Asdh&amp;webvttbaseurl=www.srf.ch%2Fsubtitles</string>
 		</dict>

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)
@@ -106,9 +106,9 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     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)
@@ -121,36 +121,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)
@@ -161,9 +161,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)
@@ -173,9 +173,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)
@@ -192,7 +192,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.swift b/Package.swift
@@ -3,7 +3,7 @@
 import PackageDescription
 
 struct ProjectSettings {
-    static let marketingVersion: String = "7.0.1"
+    static let marketingVersion: String = "7.0.2"
 }
 
 let package = Package(