Merge branch 'release/3.3.0'

SRGSSR · Aug 11, 2022 · 9c5f317 · 9c5f317
2 parents d93fddd + c72e926
commit 9c5f317
Show file tree

Hide file tree

Showing 18 changed files with 233 additions and 187 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,6 @@ xcuserdata
 /fastlane/*.xml
 
 /vendor
-/.bundle
+/.bundle
+
+.vscode
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -4,16 +4,15 @@ inherit_mode:
 
 AllCops:
   Exclude:
-    - 'Carthage/**/*'
-    - 'Demo/Carthage/**/*'
     - 'vendor/**/*'
   Include:
     - 'fastlane/Pluginfile'
+  NewCops: enable
 
 # this would cause errors with long lanes
 Metrics/BlockLength:
   Enabled: true
-  ExcludedMethods: ['platform', 'for_platform']
+  IgnoredMethods: ['platform', 'for_platform']
 
 # Lane description and gem lines can be long
 Layout/LineLength:

diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -0,0 +1,17 @@
+disabled_rules:
+    - identifier_name
+    - statement_position
+    - todo
+
+line_length: 300
+
+trailing_whitespace:
+  ignores_empty_lines: true
+  severity: warning
+
+nesting:
+  type_level: 2
+
+excluded:
+  - .build
+  - vendor
diff --git a/Demo/Demo.xcconfig b/Demo/Demo.xcconfig
@@ -1,5 +1,5 @@
 // Version information
-MARKETING_VERSION = 3.2.0
+MARKETING_VERSION = 3.3.0
 
 // Deployment targets
 IPHONEOS_DEPLOYMENT_TARGET = 12.0

diff --git a/Demo/SRGUserData-demo.xcodeproj/project.pbxproj b/Demo/SRGUserData-demo.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -272,7 +272,7 @@
 		6F0EB52820FC7F58009C02CF /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1400;
 				ORGANIZATIONNAME = "SRG SSR";
 				TargetAttributes = {
 					6F8A93D720FDCA0800AA6434 = {
@@ -323,6 +323,7 @@
 /* Begin PBXShellScriptBuildPhase section */
 		0881B5972523D3E5003F6FD5 /* Extract Signing Identity */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -396,6 +397,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -405,6 +407,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -457,6 +460,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -466,6 +470,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -491,7 +496,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 6FC7C58B23A2A59B0058349C /* Demo.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = "$(APP_ICONS_SOURCE)";
 				CLANG_ENABLE_MODULES = YES;
 				DEVELOPMENT_TEAM = VMGRRW6SG7;
 				INFOPLIST_FILE = Info.plist;
@@ -510,7 +514,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 6FC7C58B23A2A59B0058349C /* Demo.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = "$(APP_ICONS_SOURCE)";
 				CLANG_ENABLE_MODULES = YES;
 				DEVELOPMENT_TEAM = VMGRRW6SG7;
 				INFOPLIST_FILE = Info.plist;
@@ -561,7 +564,7 @@
 			repositoryURL = "https://github.com/SRGSSR/srgletterbox-apple.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 7.3.0;
+				minimumVersion = 8.3.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

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

diff --git a/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/comScore/Comscore-Swift-Package-Manager.git",
         "state": {
           "branch": null,
-          "revision": "de8577f58200195a882d3b21f1270775b02b78e2",
-          "version": "6.9.0"
+          "revision": "7e3c521ad689b0e2bbf5cfb62e19c9e1619feae2",
+          "version": "6.10.0"
         }
       },
       {
@@ -24,125 +24,125 @@
         "repositoryURL": "https://github.com/SRGSSR/FXReachability.git",
         "state": {
           "branch": null,
-          "revision": "1eac916df0045630e779fa60eef22ed0d185e15f",
-          "version": "1.3.2-srg5"
+          "revision": "b8d60cfbe6eddf1a622476548465efed88afb564",
+          "version": "1.3.2-srg6"
         }
       },
       {
         "package": "libextobjc",
         "repositoryURL": "https://github.com/SRGSSR/libextobjc.git",
         "state": {
           "branch": null,
-          "revision": "30ee5b73bdf57a826978aa146881277f22369be1",
-          "version": "0.6.0-srg3"
+          "revision": "9c9a7327410fe3f7cdb695965ced43b9a7766ee0",
+          "version": "0.6.0-srg4"
         }
       },
       {
         "package": "MAKVONotificationCenter",
         "repositoryURL": "https://github.com/SRGSSR/MAKVONotificationCenter.git",
         "state": {
           "branch": null,
-          "revision": "60395e0601ffd4a784856b423d4cac558366276d",
-          "version": "1.0.0-srg5"
+          "revision": "8bde3cdc872085bd31f4cfe546bdf8e6932a0806",
+          "version": "1.0.0-srg6"
         }
       },
       {
         "package": "Mantle",
         "repositoryURL": "https://github.com/Mantle/Mantle.git",
         "state": {
           "branch": null,
-          "revision": "bbe0cbe68582a18a6df7516778196ba3cf420ad3",
-          "version": "2.1.7"
+          "revision": "16f72bfe72a2ab29654ba894da1c32b17524e1a6",
+          "version": "2.2.0"
         }
       },
       {
         "package": "SRGAnalytics",
         "repositoryURL": "https://github.com/SRGSSR/srganalytics-apple.git",
         "state": {
           "branch": null,
-          "revision": "77088eb09c546a4d98c40e990403dd1c222f9ad7",
-          "version": "7.2.0"
+          "revision": "1ae66aa9dc392c5dbf2cd9dd7be72d277c73c685",
+          "version": "7.9.0"
         }
       },
       {
         "package": "SRGAppearance",
         "repositoryURL": "https://github.com/SRGSSR/srgappearance-apple.git",
         "state": {
           "branch": null,
-          "revision": "cfd2b130277502b1355863ac4a105fd9922be752",
-          "version": "5.0.0"
+          "revision": "72d9475b46d97ecde0298b5bc80a654e8b424ebb",
+          "version": "5.2.0"
         }
       },
       {
         "package": "SRGContentProtection",
         "repositoryURL": "https://github.com/SRGSSR/srgcontentprotection-apple.git",
         "state": {
           "branch": null,
-          "revision": "6bbd897663e516edbfa42c90bc35c5fd28a86ce6",
-          "version": "3.0.4"
+          "revision": "69420d0f2a89ae88d392385422c24acd2e5f450c",
+          "version": "3.1.0"
         }
       },
       {
         "package": "SRGDataProvider",
         "repositoryURL": "https://github.com/SRGSSR/srgdataprovider-apple.git",
         "state": {
           "branch": null,
-          "revision": "bba4ff76662a5b2987b7783152c56d1341430a81",
-          "version": "12.0.0"
+          "revision": "340c676f77eec1bd437bed91f30165736fc10abb",
+          "version": "16.1.0"
         }
       },
       {
         "package": "SRGDiagnostics",
         "repositoryURL": "https://github.com/SRGSSR/srgdiagnostics-apple.git",
         "state": {
           "branch": null,
-          "revision": "9921cec150a83df60fe4cde41ffb9e3209b21e92",
-          "version": "3.0.2"
+          "revision": "c595e8f186eb41335f0ea48848543ab3804ea22e",
+          "version": "3.1.0"
         }
       },
       {
         "package": "SRGIdentity",
         "repositoryURL": "https://github.com/SRGSSR/srgidentity-apple.git",
         "state": {
           "branch": null,
-          "revision": "c4eb6fbb3e84f8cdc340a55b50475eeddd1db011",
-          "version": "3.2.0"
+          "revision": "10368fd1679eeaffb05d84bcdc1002f3d66c2d12",
+          "version": "3.3.0"
         }
       },
       {
         "package": "SRGLetterbox",
         "repositoryURL": "https://github.com/SRGSSR/srgletterbox-apple.git",
         "state": {
           "branch": null,
-          "revision": "1ef04daa5d3e5478cc8d6e05f8f315e0acca25d4",
-          "version": "7.3.0"
+          "revision": "2db25a0d0729b7f93c137906ea9f921a107d8334",
+          "version": "8.3.0"
         }
       },
       {
         "package": "SRGLogger",
         "repositoryURL": "https://github.com/SRGSSR/srglogger-apple.git",
         "state": {
           "branch": null,
-          "revision": "5840af9ccbbc23a1269ff53feb3832f56ffde1eb",
-          "version": "3.0.2"
+          "revision": "dd98468422044b53e283d970809b8502e1ef5b8d",
+          "version": "3.1.0"
         }
       },
       {
         "package": "SRGMediaPlayer",
         "repositoryURL": "https://github.com/SRGSSR/srgmediaplayer-apple.git",
         "state": {
           "branch": null,
-          "revision": "c2330ee4819aa7f987ec18320022f66f68f53ad6",
-          "version": "6.1.4"
+          "revision": "0e5993756dc0fdfa892205fcf5bf3b9e62dd22ac",
+          "version": "7.1.0"
         }
       },
       {
         "package": "SRGNetwork",
         "repositoryURL": "https://github.com/SRGSSR/srgnetwork-apple.git",
         "state": {
           "branch": null,
-          "revision": "9d79d6649de885876577c28e7b19f24f7ce16399",
-          "version": "3.0.3"
+          "revision": "153a2544391c1aaccae2d38d8b113fd0a03421b8",
+          "version": "3.1.0"
         }
       },
       {

diff --git a/Demo/Sources/Helpers/DataViewController.m b/Demo/Sources/Helpers/DataViewController.m
@@ -24,13 +24,20 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
 
-    UITableView *tableView = [[UITableView alloc] initWithFrame:self.view.bounds];
-    tableView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+    UITableView *tableView = [[UITableView alloc] init];
     tableView.dataSource = self;
     tableView.delegate = self;
     [self.view addSubview:tableView];
     self.tableView = tableView;
 
+    tableView.translatesAutoresizingMaskIntoConstraints = NO;
+    [NSLayoutConstraint activateConstraints:@[
+        [tableView.topAnchor constraintEqualToAnchor:self.view.topAnchor],
+        [tableView.bottomAnchor constraintEqualToAnchor:self.view.bottomAnchor],
+        [tableView.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor],
+        [tableView.trailingAnchor constraintEqualToAnchor:self.view.trailingAnchor]
+    ]];
+
 #if TARGET_OS_TV
     if (@available(tvOS 13, *)) {
         // Automatically enabled for UITableViewController by default. Adopt the same behavior.

diff --git a/Gemfile b/Gemfile
@@ -8,6 +8,3 @@ source 'https://rubygems.org'
 
 gem 'fastlane'
 gem 'xcode-install'
-
-plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
-eval_gemfile(plugins_path) if File.exist?(plugins_path)