Merge branch 'release/3.2.2'

Author: pyby

.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:

.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

Demo/Demo.xcconfig

@@ -1,5 +1,5 @@
 // Version information
-MARKETING_VERSION = 3.2.1
+MARKETING_VERSION = 3.2.2
 
 // Deployment targets
 IPHONEOS_DEPLOYMENT_TARGET = 12.0

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)

Gemfile.lock

@@ -1,23 +1,24 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.3)
+    CFPropertyList (3.0.5)
+      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.554.0)
+    aws-sdk-core (3.126.0)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.525.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.54.0)
+      aws-sdk-core (~> 3, >= 3.126.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.103.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-s3 (1.112.0)
+      aws-sdk-core (~> 3, >= 3.126.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sigv4 (1.4.0)
@@ -34,18 +35,19 @@ 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.91.0)
+    faraday (1.9.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
       faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
+      faraday-net_http_persistent (~> 1.0)
       faraday-patron (~> 1.0)
       faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+      faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
@@ -54,14 +56,17 @@ 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-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    faraday_middleware (1.1.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.5)
-    fastlane (2.194.0)
+    fastimage (2.2.6)
+    fastlane (2.204.3)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -100,12 +105,10 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    fastlane-plugin-trainer (0.4.1)
-      trainer (>= 0.7.0)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.11.0)
+    google-apis-androidpublisher_v3 (0.16.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.4.1)
+    google-apis-core (0.4.2)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -114,49 +117,49 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.7.0)
+    google-apis-iamcredentials_v1 (0.10.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-playcustomapp_v1 (0.5.0)
+    google-apis-playcustomapp_v1 (0.7.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.6.0)
+    google-apis-storage_v1 (0.11.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-storage (1.34.1)
-      addressable (~> 2.5)
+    google-cloud-errors (1.2.0)
+    google-cloud-storage (1.36.1)
+      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 (0.17.1)
+    googleauth (1.1.1)
       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)
+    jmespath (1.6.0)
+    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)
     naturally (2.2.1)
     optparse (0.1.1)
-    os (1.1.1)
+    os (1.1.4)
     plist (3.6.0)
     public_suffix (4.0.6)
     rake (13.0.6)
@@ -181,10 +184,7 @@ GEM
     terminal-notifier (2.0.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    trailblazer-option (0.1.1)
-    trainer (0.9.1)
-      fastlane (>= 2.25.0)
-      plist (>= 3.1.0, < 4.0.0)
+    trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
     tty-screen (0.8.1)
     tty-spinner (0.9.3)
@@ -216,7 +216,6 @@ PLATFORMS
 
 DEPENDENCIES
   fastlane
-  fastlane-plugin-trainer
   xcode-install
 
 BUNDLED WITH

Package.swift

@@ -3,7 +3,7 @@
 import PackageDescription
 
 struct ProjectSettings {
-    static let marketingVersion: String = "3.2.1"
+    static let marketingVersion: String = "3.2.2"
 }
 
 let package = Package(

Sources/SRGIdentity/SRGIdentityLoginViewController~tvos.m

@@ -93,13 +93,13 @@ - (void)viewDidDisappear:(BOOL)animated
 - (void)loadCredentialsStackViewInView:(UIView *)view
 {
     UIStackView *credentialsStackView = [[UIStackView alloc] init];
-    credentialsStackView.translatesAutoresizingMaskIntoConstraints = NO;
     credentialsStackView.axis = UILayoutConstraintAxisVertical;
     credentialsStackView.alignment = UIStackViewAlignmentCenter;
     credentialsStackView.distribution = UIStackViewDistributionFill;
     credentialsStackView.spacing = 40.f;
     [view addSubview:credentialsStackView];
 
+    credentialsStackView.translatesAutoresizingMaskIntoConstraints = NO;
     [NSLayoutConstraint activateConstraints:@[
         [credentialsStackView.centerXAnchor constraintEqualToAnchor:view.centerXAnchor],
         [credentialsStackView.centerYAnchor constraintEqualToAnchor:view.centerYAnchor],
@@ -125,10 +125,10 @@ - (void)loadFixedSpacerWithHeight:(CGFloat)height inStackView:(UIStackView *)sta
 {
     // Zero height, but adds two stack spacing contributions and thus some spacing
     UIView *spacerView = [[UIView alloc] init];
-    spacerView.translatesAutoresizingMaskIntoConstraints = NO;
     spacerView.backgroundColor = UIColor.clearColor;
     [stackView addArrangedSubview:spacerView];
 
+    spacerView.translatesAutoresizingMaskIntoConstraints = NO;
     [NSLayoutConstraint activateConstraints:@[
         [spacerView.widthAnchor constraintEqualToAnchor:stackView.widthAnchor],
         [spacerView.heightAnchor constraintEqualToConstant:height]
@@ -138,7 +138,6 @@ - (void)loadFixedSpacerWithHeight:(CGFloat)height inStackView:(UIStackView *)sta
 - (void)loadEmailAddressTextFieldInStackView:(UIStackView *)stackView
 {
     UITextField *emailAddressTextField = [[UITextField alloc] init];
-    emailAddressTextField.translatesAutoresizingMaskIntoConstraints = NO;
     emailAddressTextField.text = self.emailAddress;
     emailAddressTextField.placeholder = SRGIdentityLocalizedString(@"Email address", @"Email address text field placeholder on Apple TV");
     emailAddressTextField.font = [SRGFont fontWithStyle:SRGFontStyleButton];
@@ -148,6 +147,7 @@ - (void)loadEmailAddressTextFieldInStackView:(UIStackView *)stackView
     [stackView addArrangedSubview:emailAddressTextField];
     self.emailAddressTextField = emailAddressTextField;
 
+    emailAddressTextField.translatesAutoresizingMaskIntoConstraints = NO;
     [NSLayoutConstraint activateConstraints:@[
         [emailAddressTextField.widthAnchor constraintEqualToAnchor:stackView.widthAnchor],
         [emailAddressTextField.heightAnchor constraintEqualToConstant:70.f]
@@ -157,7 +157,6 @@ - (void)loadEmailAddressTextFieldInStackView:(UIStackView *)stackView
 - (void)loadPasswordTextFieldInStackView:(UIStackView *)stackView
 {
     UITextField *passwordTextField = [[UITextField alloc] init];
-    passwordTextField.translatesAutoresizingMaskIntoConstraints = NO;
     passwordTextField.delegate = self;
     passwordTextField.placeholder = SRGIdentityLocalizedString(@"Password", @"Password text field placeholder on Apple TV");
     passwordTextField.font = [SRGFont fontWithStyle:SRGFontStyleButton];
@@ -167,6 +166,7 @@ - (void)loadPasswordTextFieldInStackView:(UIStackView *)stackView
     [stackView addArrangedSubview:passwordTextField];
     self.passwordTextField = passwordTextField;
 
+    passwordTextField.translatesAutoresizingMaskIntoConstraints = NO;
     [NSLayoutConstraint activateConstraints:@[
         [passwordTextField.widthAnchor constraintEqualToAnchor:stackView.widthAnchor],
         [passwordTextField.heightAnchor constraintEqualToConstant:70.f]
@@ -186,12 +186,12 @@ - (void)loadLoginButtonInStackView:(UIStackView *)stackView
 - (void)loadInstructionsStackViewInView:(UIView *)view
 {
     UIStackView *instructionsStackView = [[UIStackView alloc] init];
-    instructionsStackView.translatesAutoresizingMaskIntoConstraints = NO;
     instructionsStackView.axis = UILayoutConstraintAxisVertical;
     instructionsStackView.alignment = UIStackViewAlignmentFill;
     instructionsStackView.distribution = UIStackViewDistributionFill;
     [view addSubview:instructionsStackView];
 
+    instructionsStackView.translatesAutoresizingMaskIntoConstraints = NO;
     [NSLayoutConstraint activateConstraints:@[
         [instructionsStackView.centerXAnchor constraintEqualToAnchor:view.centerXAnchor],
         [instructionsStackView.bottomAnchor constraintEqualToAnchor:view.bottomAnchor constant:-38.f],

Sources/SRGIdentity/SRGIdentityModalTransition~ios.m

@@ -56,9 +56,7 @@ - (void)setupTransition:(id<UIViewControllerContextTransitioning>)transitionCont
 
     UIView *containerView = [transitionContext containerView];
 
-    UIView *dimmingView = [[UIView alloc] initWithFrame:containerView.bounds];
-    dimmingView.frame = containerView.bounds;
-    dimmingView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+    UIView *dimmingView = [[UIView alloc] init];
     dimmingView.backgroundColor = [UIColor colorWithWhite:0.f alpha:0.3f];
     self.dimmingView = dimmingView;
 
@@ -78,6 +76,14 @@ - (void)setupTransition:(id<UIViewControllerContextTransitioning>)transitionCont
         [containerView insertSubview:toView atIndex:0];
     }
 
+    dimmingView.translatesAutoresizingMaskIntoConstraints = NO;
+    [NSLayoutConstraint activateConstraints:@[
+        [dimmingView.topAnchor constraintEqualToAnchor:containerView.topAnchor],
+        [dimmingView.bottomAnchor constraintEqualToAnchor:containerView.bottomAnchor],
+        [dimmingView.leadingAnchor constraintEqualToAnchor:containerView.leadingAnchor],
+        [dimmingView.trailingAnchor constraintEqualToAnchor:containerView.trailingAnchor]
+    ]];
+    
     [self updateTransition:transitionContext withProgress:0.f];
 }
 

Sources/SRGIdentity/SRGIdentityWebViewController~ios.m

@@ -116,14 +116,14 @@ - (void)viewWillLayoutSubviews
 
 - (void)layoutWebViewInView:(UIView *)view
 {
-    WKWebView *webView = [[WKWebView alloc] initWithFrame:view.bounds];
+    WKWebView *webView = [[WKWebView alloc] init];
     webView.backgroundColor = UIColor.clearColor;
-    webView.translatesAutoresizingMaskIntoConstraints = NO;
     webView.navigationDelegate = self;
     webView.scrollView.delegate = self;
     [view addSubview:webView];
     self.webView = webView;
 
+    webView.translatesAutoresizingMaskIntoConstraints = NO;
     [NSLayoutConstraint activateConstraints:@[
         [webView.leadingAnchor constraintEqualToAnchor:view.safeAreaLayoutGuide.leadingAnchor],
         [webView.trailingAnchor constraintEqualToAnchor:view.safeAreaLayoutGuide.trailingAnchor],
@@ -135,10 +135,10 @@ - (void)layoutWebViewInView:(UIView *)view
 - (void)layoutProgressViewInView:(UIView *)view
 {
     UIProgressView *progressView = [[UIProgressView alloc] init];
-    progressView.translatesAutoresizingMaskIntoConstraints = NO;
     [view addSubview:progressView];
     self.progressView = progressView;
 
+    progressView.translatesAutoresizingMaskIntoConstraints = NO;
     [NSLayoutConstraint activateConstraints:@[
         [progressView.topAnchor constraintEqualToAnchor:view.safeAreaLayoutGuide.topAnchor],
         [progressView.leadingAnchor constraintEqualToAnchor:view.leadingAnchor],
@@ -149,12 +149,12 @@ - (void)layoutProgressViewInView:(UIView *)view
 - (void)layoutErrorLabelInView:(UIView *)view
 {
     UILabel *errorLabel = [[UILabel alloc] init];
-    errorLabel.translatesAutoresizingMaskIntoConstraints = NO;
     errorLabel.font = [UIFont systemFontOfSize:20.f];
     errorLabel.textColor = UIColor.grayColor;
     [view addSubview:errorLabel];
     self.errorLabel = errorLabel;
 
+    errorLabel.translatesAutoresizingMaskIntoConstraints = NO;
     [NSLayoutConstraint activateConstraints:@[
         [errorLabel.centerYAnchor constraintEqualToAnchor:view.safeAreaLayoutGuide.centerYAnchor],
         [errorLabel.leadingAnchor constraintEqualToAnchor:view.safeAreaLayoutGuide.leadingAnchor constant:40.f],