Merge branch 'release/5.2.2'

.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_PATH: "vendor/bundle"

.gitignore

@@ -12,6 +12,5 @@ xcuserdata
 /fastlane/*.xml
 
 /vendor
-/.bundle
 
 .vscode

.ruby-version

@@ -0,0 +1 @@
+3.1.3

.swiftpm/xcode/xcshareddata/xcschemes/SRGAppearance.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

.xcode-version

@@ -0,0 +1 @@
+15.3

Demo/Demo.xcconfig

@@ -1,5 +1,5 @@
 // Version information
-MARKETING_VERSION = 5.2.1
+MARKETING_VERSION = 5.2.2
 
 // Deployment targets
 IPHONEOS_DEPLOYMENT_TARGET = 12.0

Demo/SRGAppearance-demo.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -169,13 +169,13 @@
 		6FA09D2D1D9E6F8900EDCA64 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				CLASSPREFIX = SRG;
-				LastUpgradeCheck = 1400;
+				LastUpgradeCheck = 1500;
 				ORGANIZATIONNAME = "SRG SSR";
 				TargetAttributes = {
 					6FE08C5E1E8A865800EC4716 = {
 						CreatedOnToolsVersion = 8.2.1;
-						DevelopmentTeam = VMGRRW6SG7;
 						LastSwiftMigration = 1240;
 						ProvisioningStyle = Automatic;
 					};
@@ -271,6 +271,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -333,6 +334,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -356,7 +358,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = "$(APP_ICONS_SOURCE)";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SRGAppearance-demo.entitlements";
-				DEVELOPMENT_TEAM = VMGRRW6SG7;
+				DEVELOPMENT_TEAM = ABW92QGFZ7;
 				INFOPLIST_FILE = Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -377,7 +379,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = "$(APP_ICONS_SOURCE)";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SRGAppearance-demo.entitlements";
-				DEVELOPMENT_TEAM = VMGRRW6SG7;
+				DEVELOPMENT_TEAM = ABW92QGFZ7;
 				INFOPLIST_FILE = Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",

Demo/SRGAppearance-demo.xcodeproj/xcshareddata/xcschemes/SRGAppearance-demo.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Gemfile

@@ -7,4 +7,3 @@
 source 'https://rubygems.org'
 
 gem 'fastlane'
-gem 'xcode-install'

Gemfile.lock

@@ -1,27 +1,27 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.5)
+    CFPropertyList (3.0.6)
       rexml
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.634.0)
-    aws-sdk-core (3.152.0)
+    aws-partitions (1.709.0)
+    aws-sdk-core (3.170.0)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
-      aws-sigv4 (~> 1.1)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.58.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-kms (1.62.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.114.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-s3 (1.119.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.1)
+    aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.1.0)
@@ -36,8 +36,8 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.92.5)
-    faraday (1.10.2)
+    excon (0.99.0)
+    faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -66,7 +66,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.6)
-    fastlane (2.210.1)
+    fastlane (2.211.0)
       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.27.0)
-      google-apis-core (>= 0.7.2, < 2.a)
-    google-apis-core (0.9.0)
+    google-apis-androidpublisher_v3 (0.33.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-core (0.11.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -117,27 +117,27 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.14.0)
-      google-apis-core (>= 0.7.2, < 2.a)
-    google-apis-playcustomapp_v1 (0.10.0)
-      google-apis-core (>= 0.7, < 2.a)
-    google-apis-storage_v1 (0.17.0)
-      google-apis-core (>= 0.7, < 2.a)
+    google-apis-iamcredentials_v1 (0.16.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-playcustomapp_v1 (0.12.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-storage_v1 (0.19.0)
+      google-apis-core (>= 0.9.0, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
     google-cloud-errors (1.3.0)
-    google-cloud-storage (1.42.0)
+    google-cloud-storage (1.44.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.17.0)
+      google-apis-storage_v1 (~> 0.19.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.2.0)
+    googleauth (1.3.0)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -148,11 +148,11 @@ GEM
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    jmespath (1.6.1)
-    json (2.6.2)
-    jwt (2.5.0)
+    jmespath (1.6.2)
+    json (2.6.3)
+    jwt (2.7.0)
     memoist (0.16.2)
-    mini_magick (4.11.0)
+    mini_magick (4.12.0)
     mini_mime (1.1.2)
     multi_json (1.15.0)
     multipart-post (2.0.0)
@@ -161,7 +161,7 @@ GEM
     optparse (0.1.1)
     os (1.1.4)
     plist (3.6.0)
-    public_suffix (5.0.0)
+    public_suffix (5.0.1)
     rake (13.0.6)
     representable (3.2.0)
       declarative (< 0.1.0)
@@ -178,7 +178,7 @@ GEM
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simctl (1.6.8)
+    simctl (1.6.10)
       CFPropertyList
       naturally
     terminal-notifier (2.0.0)
@@ -194,11 +194,8 @@ GEM
       unf_ext
     unf_ext (0.0.8.2)
     unicode-display_width (1.8.0)
-    webrick (1.7.0)
+    webrick (1.8.1)
     word_wrap (1.0.0)
-    xcode-install (2.8.1)
-      claide (>= 0.9.1)
-      fastlane (>= 2.1.0, < 3.0.0)
     xcodeproj (1.22.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
@@ -216,7 +213,6 @@ PLATFORMS
 
 DEPENDENCIES
   fastlane
-  xcode-install
 
 BUNDLED WITH
-   1.17.2
+   2.4.6

Makefile

@@ -21,11 +21,18 @@ lint:
 	@swiftlint --fix && swiftlint
 	@echo "... done.\n"
 
+.PHONY: rbenv
+rbenv:
+	@echo "Installing needed ruby version if missing..."
+	@Scripts/rbenv-install.sh "./"
+	@echo "... done.\n"
+
 .PHONY: help
 help:
 	@echo "The following targets are available:"
 	@echo "   all                 Build and run unit tests for all platforms"
-	@echo "   lint      Lint project and fix issues"
 	@echo "   test-ios            Build and run unit tests for iOS"
 	@echo "   test-tvos           Build and run unit tests for tvOS"
+	@echo "   lint                Lint project and fix issues"
+	@echo "   rbenv               Install needed ruby version if missing"
 	@echo "   help                Display this help message"

Package.swift

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

Scripts/rbenv-install.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# This script attempts to install the local ruby version if not installed.
+
+REPOSITORY_FOLDER=$1
+
+if [[ -z "${REPOSITORY_FOLDER}" ]]; then
+    echo "A repository folder must be provided."
+    exit 1
+fi
+
+RUBY_VERSION=$(cat "${REPOSITORY_FOLDER}/.ruby-version")
+
+if [[ -z "${RUBY_VERSION}" ]]; then
+    echo "A local ruby version must be provided in .ruby-version file. See rbenv local command."
+    exit 1
+fi
+
+if ! rbenv versions | grep "${RUBY_VERSION}" &> /dev/null; then
+    echo "Need to install Ruby ${RUBY_VERSION}."
+    rbenv install "${RUBY_VERSION}"
+    echo "Ruby ${RUBY_VERSION} now installed."
+else 
+    echo "Ruby ${RUBY_VERSION} already installed."
+fi

Sources/SRGAppearance/SRGFont.m

@@ -172,18 +172,18 @@ static UIFontWeight SRGWeightForStyle(SRGFontStyle style)
                        @(SRGFontStyleH2) : @(SRGFontWeightMedium),
                        @(SRGFontStyleH3) : @(SRGFontWeightMedium),
                        @(SRGFontStyleH4) : @(SRGFontWeightMedium),
-                       @(SRGFontStyleSubtitle1) : @(SRGFontWeightLight),
+                       @(SRGFontStyleSubtitle1) : @(SRGFontWeightRegular),
                        @(SRGFontStyleSubtitle2) : @(SRGFontWeightRegular),
                        @(SRGFontStyleBody) : @(SRGFontWeightRegular),
                        @(SRGFontStyleButton) : @(SRGFontWeightMedium),
                        @(SRGFontStyleCaption) : @(SRGFontWeightMedium),
                        @(SRGFontStyleLabel) : @(SRGFontWeightBold) };
 #else
         s_weights = @{ @(SRGFontStyleH1) : @(SRGFontWeightBold),
-                       @(SRGFontStyleH2) : @(SRGFontWeightMedium),
+                       @(SRGFontStyleH2) : @(SRGFontWeightBold),
                        @(SRGFontStyleH3) : @(SRGFontWeightMedium),
                        @(SRGFontStyleH4) : @(SRGFontWeightMedium),
-                       @(SRGFontStyleSubtitle1) : @(SRGFontWeightLight),
+                       @(SRGFontStyleSubtitle1) : @(SRGFontWeightRegular),
                        @(SRGFontStyleSubtitle2) : @(SRGFontWeightMedium),
                        @(SRGFontStyleBody) : @(SRGFontWeightRegular),
                        @(SRGFontStyleButton) : @(SRGFontWeightRegular),

Sources/SRGAppearance/UIColor+SRGAppearance.m

@@ -54,6 +54,11 @@ + (UIColor *)srg_gray4AColor
     return [UIColor srg_colorFromHexadecimalString:@"#4a4a4a"];
 }
 
++ (UIColor *)srg_gray71Color
+{
+    return [UIColor srg_colorFromHexadecimalString:@"#717171"];
+}
+
 + (UIColor *)srg_gray96Color
 {
     return [UIColor srg_colorFromHexadecimalString:@"#969696"];
@@ -64,6 +69,11 @@ + (UIColor *)srg_grayC7Color
     return [UIColor srg_colorFromHexadecimalString:@"#c7c7c7"];
 }
 
++ (UIColor *)srg_grayD2Color
+{
+    return [UIColor srg_colorFromHexadecimalString:@"#d2d2d2"];
+}
+
 + (UIColor *)srg_colorFromHexadecimalString:(NSString *)hexadecimalString
 {
     return [SRGHexadecimalColorTransformer() transformedValue:hexadecimalString];

Sources/SRGAppearance/include/UIColor+SRGAppearance.h

@@ -31,8 +31,10 @@ OBJC_EXPORT NSValueTransformer *SRGHexadecimalColorTransformer(void);
 @property (class, nonatomic, readonly) UIColor *srg_gray23Color NS_REFINED_FOR_SWIFT;
 @property (class, nonatomic, readonly) UIColor *srg_gray33Color NS_REFINED_FOR_SWIFT;
 @property (class, nonatomic, readonly) UIColor *srg_gray4AColor NS_REFINED_FOR_SWIFT;
+@property (class, nonatomic, readonly) UIColor *srg_gray71Color NS_REFINED_FOR_SWIFT;
 @property (class, nonatomic, readonly) UIColor *srg_gray96Color NS_REFINED_FOR_SWIFT;
-@property (class, nonatomic, readonly) UIColor *srg_grayC7Color NS_REFINED_FOR_SWIFT;
+@property (class, nonatomic, readonly) UIColor *srg_grayC7Color NS_REFINED_FOR_SWIFT __attribute__((deprecated("Use srg_grayD2Color instead")));
+@property (class, nonatomic, readonly) UIColor *srg_grayD2Color NS_REFINED_FOR_SWIFT;
 
 /**
  *  Returns the color matching a hexadecimal #rrggbbaa or #rrggbb string representation (the leading wildcard is optional),