Merge branch 'release/7.3.1'

SRGSSR · Nov 2, 2021 · fc40866 · fc40866
2 parents 1ef04da + ed1f9e4
commit fc40866
Show file tree

Hide file tree

Showing 13 changed files with 124 additions and 109 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 = "1300"
+   LastUpgradeVersion = "1310"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Demo/Demo.xcconfig b/Demo/Demo.xcconfig
@@ -1,6 +1,6 @@
 // Version information
-MARKETING_VERSION = 7.3.0
-CURRENT_PROJECT_VERSION = 86
+MARKETING_VERSION = 7.3.1
+CURRENT_PROJECT_VERSION = 87
 
 // Deployment targets
 IPHONEOS_DEPLOYMENT_TARGET = 12.0

diff --git a/Demo/SRGLetterbox-demo.xcodeproj/project.pbxproj b/Demo/SRGLetterbox-demo.xcodeproj/project.pbxproj
@@ -359,7 +359,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = SRG;
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1310;
 				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 = "1300"
+   LastUpgradeVersion = "1310"
    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
@@ -60,8 +60,8 @@
         "repositoryURL": "https://github.com/SRGSSR/srganalytics-apple.git",
         "state": {
           "branch": null,
-          "revision": "77088eb09c546a4d98c40e990403dd1c222f9ad7",
-          "version": "7.2.0"
+          "revision": "d20dc0fb85e572c44e902c6c29dc810c611ca6ad",
+          "version": "7.3.0"
         }
       },
       {
@@ -87,8 +87,8 @@
         "repositoryURL": "https://github.com/SRGSSR/srgdataprovider-apple.git",
         "state": {
           "branch": null,
-          "revision": "bba4ff76662a5b2987b7783152c56d1341430a81",
-          "version": "12.0.0"
+          "revision": "8b3f5e742a0ab28097e84520deec49320c1e9d9a",
+          "version": "12.1.0"
         }
       },
       {
@@ -123,8 +123,8 @@
         "repositoryURL": "https://github.com/SRGSSR/srgmediaplayer-apple.git",
         "state": {
           "branch": null,
-          "revision": "c2330ee4819aa7f987ec18320022f66f68f53ad6",
-          "version": "6.1.4"
+          "revision": "fbd7ad3121c7112cf1ce55bb96638ef09a6cf5ec",
+          "version": "6.1.5"
         }
       },
       {

diff --git a/Demo/Sources/Demos/FeedsViewController.h b/Demo/Sources/Demos/FeedsViewController.h
@@ -27,7 +27,7 @@ typedef API_UNAVAILABLE(tvos) NS_ENUM(NSInteger, Feed) {
 };
 
 API_UNAVAILABLE(tvos)
-@interface FeedsViewController : UITableViewController
+@interface FeedsViewController : UIViewController <UITableViewDataSource, UITableViewDelegate>
 
 @property (nonatomic) Feed feed;
 

diff --git a/Demo/Sources/Demos/FeedsViewController~ios.m b/Demo/Sources/Demos/FeedsViewController~ios.m
@@ -17,6 +17,8 @@ @interface FeedsViewController ()
 
 @property (nonatomic) NSArray<SRGMedia *> *medias;
 
+@property (nonatomic, weak) IBOutlet UITableView *tableView;
+
 @property (nonatomic) SRGDataProvider *dataProvider;
 @property (nonatomic, weak) SRGRequest *request;
 
@@ -38,6 +40,9 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
 
+    self.tableView.dataSource = self;
+    self.tableView.delegate = self;
+
     [NSNotificationCenter.defaultCenter addObserver:self
                                            selector:@selector(applicationDidBecomeActive:)
                                                name:UIApplicationDidBecomeActiveNotification

diff --git a/Demo/Sources/Demos/FeedsViewController~ios.storyboard b/Demo/Sources/Demos/FeedsViewController~ios.storyboard
@@ -1,71 +1,88 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="jxl-Jc-tdC">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="9Rd-Yf-pKC">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Feeds View Controller-->
-        <scene sceneID="sak-kS-eIB">
+        <scene sceneID="F1h-t0-9QO">
             <objects>
-                <tableViewController id="jxl-Jc-tdC" customClass="FeedsViewController" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="185" sectionHeaderHeight="28" sectionFooterHeight="28" id="a3B-hA-p0L">
+                <viewController id="9Rd-Yf-pKC" customClass="FeedsViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="HD5-Pr-Cvu">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                        <prototypes>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="FeedTableViewCell" rowHeight="212" id="838-HX-Muy" customClass="FeedTableViewCell">
-                                <rect key="frame" x="0.0" y="28" width="414" height="212"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="838-HX-Muy" id="biV-rX-1zW">
-                                    <rect key="frame" x="0.0" y="0.0" width="414" height="212"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                    <subviews>
-                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2F0-qR-bO6" customClass="SRGLetterboxView">
+                        <subviews>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="hJo-Iz-YmR">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <prototypes>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="FeedTableViewCell" rowHeight="212" id="Jl2-Dw-Lcf" customClass="FeedTableViewCell">
+                                        <rect key="frame" x="0.0" y="44.5" width="414" height="212"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Jl2-Dw-Lcf" id="TSG-Ub-sdZ">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="212"/>
-                                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                        </view>
-                                        <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" progress="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="Lc6-DR-gyf">
-                                            <rect key="frame" x="0.0" y="210" width="414" height="2"/>
-                                            <color key="tintColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-                                        </progressView>
-                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sound_off" translatesAutoresizingMaskIntoConstraints="NO" id="SSB-Kb-X95" userLabel="Sound Image View">
-                                            <rect key="frame" x="376" y="172" width="28" height="28"/>
-                                        </imageView>
-                                    </subviews>
-                                    <constraints>
-                                        <constraint firstAttribute="trailing" secondItem="Lc6-DR-gyf" secondAttribute="trailing" id="4pe-zD-IrL"/>
-                                        <constraint firstItem="Lc6-DR-gyf" firstAttribute="top" secondItem="SSB-Kb-X95" secondAttribute="bottom" constant="10" id="H06-wb-LKv"/>
-                                        <constraint firstItem="Lc6-DR-gyf" firstAttribute="leading" secondItem="biV-rX-1zW" secondAttribute="leading" id="Ndu-wI-nBV"/>
-                                        <constraint firstAttribute="bottom" secondItem="Lc6-DR-gyf" secondAttribute="bottom" id="VGf-Er-hQl"/>
-                                        <constraint firstAttribute="bottom" secondItem="2F0-qR-bO6" secondAttribute="bottom" id="Zcm-tH-8tD"/>
-                                        <constraint firstItem="2F0-qR-bO6" firstAttribute="top" secondItem="biV-rX-1zW" secondAttribute="top" id="ciP-ym-8u5"/>
-                                        <constraint firstAttribute="trailing" secondItem="2F0-qR-bO6" secondAttribute="trailing" id="j0t-h0-gTQ"/>
-                                        <constraint firstItem="2F0-qR-bO6" firstAttribute="leading" secondItem="biV-rX-1zW" secondAttribute="leading" id="kib-3G-gdZ"/>
-                                        <constraint firstAttribute="trailing" secondItem="SSB-Kb-X95" secondAttribute="trailing" constant="10" id="w2p-rD-rSG"/>
-                                    </constraints>
-                                </tableViewCellContentView>
-                                <connections>
-                                    <outlet property="letterboxView" destination="2F0-qR-bO6" id="Zrg-9O-Zir"/>
-                                    <outlet property="progressView" destination="Lc6-DR-gyf" id="Wo9-v9-54n"/>
-                                    <outlet property="soundIndicatorImageView" destination="SSB-Kb-X95" id="Hpg-au-rtD"/>
-                                </connections>
-                            </tableViewCell>
-                        </prototypes>
-                        <connections>
-                            <outlet property="dataSource" destination="jxl-Jc-tdC" id="jg2-Ts-TrE"/>
-                            <outlet property="delegate" destination="jxl-Jc-tdC" id="VCd-ET-mKq"/>
-                        </connections>
-                    </tableView>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="3ki-tE-rZ3" userLabel="First Responder" sceneMemberID="firstResponder"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hvi-AS-1mJ" customClass="SRGLetterboxView">
+                                                    <rect key="frame" x="0.0" y="0.0" width="414" height="212"/>
+                                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                </view>
+                                                <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" progress="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="PCH-Kn-EVI">
+                                                    <rect key="frame" x="0.0" y="208" width="414" height="4"/>
+                                                    <color key="tintColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                                </progressView>
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sound_off" translatesAutoresizingMaskIntoConstraints="NO" id="CPd-mE-fA8" userLabel="Sound Image View">
+                                                    <rect key="frame" x="376" y="170" width="28" height="28"/>
+                                                </imageView>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="trailing" secondItem="CPd-mE-fA8" secondAttribute="trailing" constant="10" id="Cj7-J1-dO8"/>
+                                                <constraint firstItem="PCH-Kn-EVI" firstAttribute="top" secondItem="CPd-mE-fA8" secondAttribute="bottom" constant="10" id="EdX-9R-XVU"/>
+                                                <constraint firstAttribute="trailing" secondItem="PCH-Kn-EVI" secondAttribute="trailing" id="O7U-Su-7eS"/>
+                                                <constraint firstItem="hvi-AS-1mJ" firstAttribute="leading" secondItem="TSG-Ub-sdZ" secondAttribute="leading" id="Ssy-UF-5oj"/>
+                                                <constraint firstAttribute="bottom" secondItem="hvi-AS-1mJ" secondAttribute="bottom" id="Sv0-S5-tjn"/>
+                                                <constraint firstAttribute="trailing" secondItem="hvi-AS-1mJ" secondAttribute="trailing" id="c6f-fd-rqF"/>
+                                                <constraint firstItem="hvi-AS-1mJ" firstAttribute="top" secondItem="TSG-Ub-sdZ" secondAttribute="top" id="ocw-vl-OMG"/>
+                                                <constraint firstAttribute="bottom" secondItem="PCH-Kn-EVI" secondAttribute="bottom" id="uxl-QG-hzI"/>
+                                                <constraint firstItem="PCH-Kn-EVI" firstAttribute="leading" secondItem="TSG-Ub-sdZ" secondAttribute="leading" id="wuV-kW-cRD"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                        <connections>
+                                            <outlet property="letterboxView" destination="hvi-AS-1mJ" id="Iq2-Jr-XCm"/>
+                                            <outlet property="progressView" destination="PCH-Kn-EVI" id="226-ud-PQy"/>
+                                            <outlet property="soundIndicatorImageView" destination="CPd-mE-fA8" id="kVO-Ma-s0m"/>
+                                        </connections>
+                                    </tableViewCell>
+                                </prototypes>
+                            </tableView>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="2Rl-hI-RVY"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="hJo-Iz-YmR" secondAttribute="trailing" id="Vnx-a9-BFR"/>
+                            <constraint firstItem="hJo-Iz-YmR" firstAttribute="top" secondItem="HD5-Pr-Cvu" secondAttribute="top" id="bcz-Sf-hpC"/>
+                            <constraint firstAttribute="bottom" secondItem="hJo-Iz-YmR" secondAttribute="bottom" id="j0Y-jM-Ckn"/>
+                            <constraint firstItem="hJo-Iz-YmR" firstAttribute="leading" secondItem="HD5-Pr-Cvu" secondAttribute="leading" id="wua-90-BQm"/>
+                        </constraints>
+                    </view>
+                    <connections>
+                        <outlet property="tableView" destination="hJo-Iz-YmR" id="UYb-m0-fa4"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="KYn-WP-AQv" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-332" y="39.130434782608695"/>
+            <point key="canvasLocation" x="-809" y="-634"/>
         </scene>
     </scenes>
     <resources>
         <image name="sound_off" width="28" height="28"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,23 +1,24 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.3)
+    CFPropertyList (3.0.4)
+      rexml
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.502.0)
-    aws-sdk-core (3.121.0)
+    aws-partitions (1.518.0)
+    aws-sdk-core (3.121.3)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.48.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-kms (1.50.0)
+      aws-sdk-core (~> 3, >= 3.121.2)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.103.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-s3 (1.104.0)
+      aws-sdk-core (~> 3, >= 3.121.2)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sigv4 (1.4.0)
@@ -34,9 +35,9 @@ GEM
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
-    emoji_regex (3.2.2)
-    excon (0.85.0)
-    faraday (1.7.2)
+    emoji_regex (3.2.3)
+    excon (0.87.0)
+    faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -58,10 +59,10 @@ GEM
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    faraday_middleware (1.1.0)
+    faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.5)
-    fastlane (2.194.0)
+    fastlane (2.197.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -105,7 +106,7 @@ GEM
       trainer (>= 0.7.0)
     fastlane-plugin-xcconfig (2.0.0)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.11.0)
+    google-apis-androidpublisher_v3 (0.12.0)
       google-apis-core (>= 0.4, < 2.a)
     google-apis-core (0.4.1)
       addressable (~> 2.5, >= 2.5.1)
@@ -120,14 +121,14 @@ GEM
       google-apis-core (>= 0.4, < 2.a)
     google-apis-playcustomapp_v1 (0.5.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.6.0)
+    google-apis-storage_v1 (0.8.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-errors (1.1.0)
+    google-cloud-errors (1.2.0)
     google-cloud-storage (1.34.1)
       addressable (~> 2.5)
       digest-crc (~> 0.4)
@@ -136,23 +137,23 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (0.17.1)
+    googleauth (1.1.0)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.15)
+      signet (>= 0.16, < 2.a)
     highline (2.0.3)
     http-cookie (1.0.4)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.4.0)
-    json (2.5.1)
-    jwt (2.2.3)
+    json (2.6.1)
+    jwt (2.3.0)
     memoist (0.16.2)
     mini_magick (4.11.0)
-    mini_mime (1.1.1)
+    mini_mime (1.1.2)
     multi_json (1.15.0)
     multipart-post (2.0.0)
     nanaimo (0.3.0)