Merge branch 'release/8.4.0'

SRGSSR · Nov 9, 2022 · 601ba16 · 601ba16
2 parents b8b0f87 + a45f238
commit 601ba16
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 33 deletions.
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": "1ae66aa9dc392c5dbf2cd9dd7be72d277c73c685",
-          "version": "7.9.0"
+          "revision": "45a2a1b1a879ad60b9857c1bc3fa5b4e314f6565",
+          "version": "7.10.0"
         }
       },
       {
@@ -105,8 +105,8 @@
         "repositoryURL": "https://github.com/SRGSSR/srgdataprovider-apple.git",
         "state": {
           "branch": null,
-          "revision": "4f840770c70bbe47340bfd32ff856d71ba002093",
-          "version": "16.1.1"
+          "revision": "7b1c3e001213315ef1eed9892cb97651a3e03dfd",
+          "version": "17.0.0"
         }
       },
       {

diff --git a/Demo/Sources/Demos/ListsViewController.m b/Demo/Sources/Demos/ListsViewController.m
@@ -51,7 +51,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
         s_rows = @[ @6,
                     @4,
                     @4,
-                    @3,
+                    @6,
                     @4,
                     @5,
                     @15 ];
@@ -122,9 +122,12 @@ - (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)ce
                          NSLocalizedString(@"RTS", nil),
                          NSLocalizedString(@"RSI", nil),
                          NSLocalizedString(@"RTR", nil) ],
-                      @[ NSLocalizedString(@"SRF", nil),
-                         NSLocalizedString(@"RTS", nil),
-                         NSLocalizedString(@"RSI", nil) ],
+                      @[ NSLocalizedString(@"SRF (with result)", nil),
+                         NSLocalizedString(@"SRF (all)", nil),
+                         NSLocalizedString(@"RTS (with result)", nil),
+                         NSLocalizedString(@"RTS (all)", nil),
+                         NSLocalizedString(@"RSI (with result)", nil),
+                         NSLocalizedString(@"RSI (all)", nil) ],
                       @[ NSLocalizedString(@"SRF", nil),
                          NSLocalizedString(@"RTS", nil),
                          NSLocalizedString(@"RSI", nil),
@@ -202,8 +205,11 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
             static NSArray<NSNumber *> *s_lists;
             dispatch_once(&s_onceToken, ^{
                 s_lists = @[ @(MediaListLiveCenterSRF),
+                             @(MediaListLiveCenterAllSRF),
                              @(MediaListLiveCenterRTS),
-                             @(MediaListLiveCenterRSI) ];
+                             @(MediaListLiveCenterAllRTS),
+                             @(MediaListLiveCenterRSI),
+                             @(MediaListLiveCenterAllRSI) ];
             });
             [self openMediaListWithType:s_lists[indexPath.row].integerValue];
             break;

diff --git a/Demo/Sources/Demos/MediaListViewController.h b/Demo/Sources/Demos/MediaListViewController.h
@@ -18,17 +18,29 @@ typedef NS_ENUM(NSInteger, MediaList) {
      */
     MediaListUnknown = 0,
     /**
-     *  Live center SRF
+     *  Live center SRF (only with result)
      */
     MediaListLiveCenterSRF,
     /**
-     *  Live center RTS
+     *  Live center RTS (only with result)
      */
     MediaListLiveCenterRTS,
     /**
-     *  Live center RSI
+     *  Live center RSI (only with result)
      */
     MediaListLiveCenterRSI,
+    /**
+     *  Live center SRF (all)
+     */
+    MediaListLiveCenterAllSRF,
+    /**
+     *  Live center RTS (all)
+     */
+    MediaListLiveCenterAllRTS,
+    /**
+     *  Live center RSI (all)
+     */
+    MediaListLiveCenterAllRSI,
     /**
      *  Latest by topic
      */

diff --git a/Demo/Sources/Demos/MediaListViewController.m b/Demo/Sources/Demos/MediaListViewController.m
@@ -97,9 +97,12 @@ - (NSString *)title
         static dispatch_once_t s_onceToken;
         static NSDictionary<NSNumber *, NSString *> *s_titles;
         dispatch_once(&s_onceToken, ^{
-            s_titles = @{ @(MediaListLiveCenterSRF) : NSLocalizedString(@"SRF Live center", nil),
-                          @(MediaListLiveCenterRTS) : NSLocalizedString(@"RTS Live center", nil),
-                          @(MediaListLiveCenterRSI) : NSLocalizedString(@"RSI Live center", nil),
+            s_titles = @{ @(MediaListLiveCenterSRF) : NSLocalizedString(@"SRF Live center (with result)", nil),
+                          @(MediaListLiveCenterRTS) : NSLocalizedString(@"RTS Live center (with result)", nil),
+                          @(MediaListLiveCenterRSI) : NSLocalizedString(@"RSI Live center (with result)", nil),
+                          @(MediaListLiveCenterAllSRF) : NSLocalizedString(@"SRF Live center (all)", nil),
+                          @(MediaListLiveCenterAllRTS) : NSLocalizedString(@"RTS Live center (all)", nil),
+                          @(MediaListLiveCenterAllRSI) : NSLocalizedString(@"RSI Live center (all)", nil),
                           @(MediaListLiveTVSRF) : NSLocalizedString(@"SRF Live TVs", nil),
                           @(MediaListLiveTVRTS) : NSLocalizedString(@"RTS Live TVs", nil),
                           @(MediaListLiveTVRSI) : NSLocalizedString(@"RSI Live TVs", nil),
@@ -175,7 +178,24 @@ - (void)refresh
 
             NSNumber *vendorNumber = s_vendors[@(self.mediaList)];
             NSAssert(vendorNumber != nil, @"The business unit must be supported");
-            request = [[self.dataProvider liveCenterVideosForVendor:vendorNumber.integerValue withCompletionBlock:completionBlock] requestWithPageSize:100];
+            request = [[self.dataProvider liveCenterVideosForVendor:vendorNumber.integerValue contentTypeFilter:SRGContentTypeFilterNone eventsWithResultOnly:YES withCompletionBlock:completionBlock] requestWithPageSize:100];
+            break;
+        }
+
+        case MediaListLiveCenterAllSRF:
+        case MediaListLiveCenterAllRTS:
+        case MediaListLiveCenterAllRSI: {
+            static NSDictionary<NSNumber *, NSNumber *> *s_vendors;
+            static dispatch_once_t s_onceToken;
+            dispatch_once(&s_onceToken, ^{
+                s_vendors = @{ @(MediaListLiveCenterAllSRF) : @(SRGVendorSRF),
+                               @(MediaListLiveCenterAllRTS) : @(SRGVendorRTS),
+                               @(MediaListLiveCenterAllRSI) : @(SRGVendorRSI) };
+            });
+
+            NSNumber *vendorNumber = s_vendors[@(self.mediaList)];
+            NSAssert(vendorNumber != nil, @"The business unit must be supported");
+            request = [[self.dataProvider liveCenterVideosForVendor:vendorNumber.integerValue contentTypeFilter:SRGContentTypeFilterNone eventsWithResultOnly:NO withCompletionBlock:completionBlock] requestWithPageSize:100];
             break;
         }
 
@@ -316,7 +336,7 @@ - (void)refresh
 
             NSNumber *vendorNumber = s_vendors[@(self.mediaList)];
             NSAssert(vendorNumber != nil, @"The business unit must be supported");
-            request = [[self.dataProvider tvScheduledLivestreamsForVendor:vendorNumber.integerValue withCompletionBlock:completionBlock] requestWithPageSize:100];
+            request = [[self.dataProvider tvScheduledLivestreamsForVendor:vendorNumber.integerValue signLanguageOnly:NO withCompletionBlock:completionBlock] requestWithPageSize:100];
             break;
         }
 

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.3.2
-CURRENT_PROJECT_VERSION = 100
+MARKETING_VERSION = 8.4.0
+CURRENT_PROJECT_VERSION = 101
 
 // Deployment targets
 IPHONEOS_DEPLOYMENT_TARGET = 12.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": "1ae66aa9dc392c5dbf2cd9dd7be72d277c73c685",
-          "version": "7.9.0"
+          "revision": "45a2a1b1a879ad60b9857c1bc3fa5b4e314f6565",
+          "version": "7.10.0"
         }
       },
       {
@@ -87,8 +87,8 @@
         "repositoryURL": "https://github.com/SRGSSR/srgdataprovider-apple.git",
         "state": {
           "branch": null,
-          "revision": "4f840770c70bbe47340bfd32ff856d71ba002093",
-          "version": "16.1.1"
+          "revision": "7b1c3e001213315ef1eed9892cb97651a3e03dfd",
+          "version": "17.0.0"
         }
       },
       {

diff --git a/Package.swift b/Package.swift
@@ -3,7 +3,7 @@
 import PackageDescription
 
 struct ProjectSettings {
-    static let marketingVersion: String = "8.3.2"
+    static let marketingVersion: String = "8.4.0"
 }
 
 let package = Package(
@@ -22,7 +22,7 @@ let package = Package(
     dependencies: [
         .package(name: "FXReachability", url: "https://github.com/SRGSSR/FXReachability.git", .exact("1.3.2-srg6")),
         .package(name: "OHHTTPStubs", url: "https://github.com/AliSoftware/OHHTTPStubs.git", .upToNextMajor(from: "9.0.0")),
-        .package(name: "SRGAnalytics", url: "https://github.com/SRGSSR/srganalytics-apple.git", .upToNextMinor(from: "7.9.0")),
+        .package(name: "SRGAnalytics", url: "https://github.com/SRGSSR/srganalytics-apple.git", .upToNextMinor(from: "7.10.0")),
         .package(name: "SRGAppearance", url: "https://github.com/SRGSSR/srgappearance-apple.git", .upToNextMinor(from: "5.2.0")),
         .package(name: "YYWebImage", url: "https://github.com/SRGSSR/YYWebImage.git", .exact("1.0.5-srg3"))
     ],

diff --git a/WhatsNew-demo.json b/WhatsNew-demo.json
@@ -64,5 +64,6 @@
   "8.2.1-97": "- This releases is a maintenance release without visible changes.",
   "8.3.0-98": "- Xcode compatibility: this demo is built with Xcode 14 beta 5 version.\n- Remove superfluous zoom gestures when zooming is not possible.",
   "8.3.1-99": "- Fix iOS timeline view not interactive in some cases (playback stopped, Mac with Apple Silicon).\n- Restore custom url to open a media.\n- Add SAM servers in the settings tab.",
-  "8.3.2-100": "- Maintenance release for unit tests."
+  "8.3.2-100": "- Maintenance release for unit tests.",
+  "8.4.0-101": "- Maintenance release for the library.\n- App: update Live Center section in list tab."
 }
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -197,20 +197,20 @@ platform :ios do
 
       pilot_fast_upload(platform)
 
-      clean_build_artifacts
-
       UI.message "SRGLetterbox-demo (Release #{build_number}) uploaded. ✅"
+
+      appcenter_appname = appcenter_testflight_demo_name(platform)
+      upload_appcenter_dsyms(appcenter_appname)
+
+      UI.message "SRGLetterbox-demo (Release #{build_number}) dSYM file OK. ✅"
+
+      clean_build_artifacts
     end
 
     pilot_distribute(platform, build_number, what_s_new_for_demo)
 
     UI.message "SRGLetterbox-demo (Release #{build_number}) distributed. ✅"
 
-    appcenter_appname = appcenter_testflight_demo_name(platform)
-    upload_appcenter_dsyms(appcenter_appname)
-
-    UI.message "SRGLetterbox-demo (Release #{build_number}) dSYM file OK. ✅"
-
     UI.important('You are responsible to tag the library and bump the version (and the build number).')
   end