Skip to content

Commit

Permalink
Merge branch 'release/5.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
pyby committed Oct 28, 2022
2 parents 72d9475 + efc860e commit 37858eb
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 24 deletions.
2 changes: 1 addition & 1 deletion Demo/Demo.xcconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Version information
MARKETING_VERSION = 5.2.0
MARKETING_VERSION = 5.2.1

// Deployment targets
IPHONEOS_DEPLOYMENT_TARGET = 12.0
Expand Down
32 changes: 16 additions & 16 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ GEM
specs:
CFPropertyList (3.0.5)
rexml
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
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.616.0)
aws-sdk-core (3.132.0)
aws-partitions (1.634.0)
aws-sdk-core (3.152.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
Expand All @@ -36,8 +36,8 @@ GEM
unf (>= 0.0.5, < 1.0.0)
dotenv (2.8.1)
emoji_regex (3.2.3)
excon (0.92.4)
faraday (1.10.1)
excon (0.92.5)
faraday (1.10.2)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
Expand Down Expand Up @@ -66,7 +66,7 @@ GEM
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.2.6)
fastlane (2.208.0)
fastlane (2.210.1)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
Expand Down Expand Up @@ -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.25.0)
google-apis-core (>= 0.7, < 2.a)
google-apis-core (0.7.0)
google-apis-androidpublisher_v3 (0.27.0)
google-apis-core (>= 0.7.2, < 2.a)
google-apis-core (0.9.0)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
Expand All @@ -117,8 +117,8 @@ GEM
retriable (>= 2.0, < 4.a)
rexml
webrick
google-apis-iamcredentials_v1 (0.13.0)
google-apis-core (>= 0.7, < 2.a)
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)
Expand All @@ -128,8 +128,8 @@ GEM
google-cloud-errors (~> 1.0)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.2.0)
google-cloud-storage (1.38.0)
google-cloud-errors (1.3.0)
google-cloud-storage (1.42.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
Expand All @@ -150,7 +150,7 @@ GEM
httpclient (2.8.3)
jmespath (1.6.1)
json (2.6.2)
jwt (2.4.1)
jwt (2.5.0)
memoist (0.16.2)
mini_magick (4.11.0)
mini_mime (1.1.2)
Expand All @@ -161,7 +161,7 @@ GEM
optparse (0.1.1)
os (1.1.4)
plist (3.6.0)
public_suffix (4.0.7)
public_suffix (5.0.0)
rake (13.0.6)
representable (3.2.0)
declarative (< 0.1.0)
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import PackageDescription

struct ProjectSettings {
static let marketingVersion: String = "5.2.0"
static let marketingVersion: String = "5.2.1"
}

let package = Package(
Expand Down
9 changes: 6 additions & 3 deletions Sources/SRGAppearance/SRGFont.m
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,12 @@ static UIFontTextStyle SRGTextStyleForStyle(SRGFontStyle style)
{
NSArray<NSURL *> *fontFileURLs = [SWIFTPM_MODULE_BUNDLE URLsForResourcesWithExtension:@"ttf" subdirectory:nil];
for (NSURL *fileURL in fontFileURLs) {
__unused BOOL success = CTFontManagerRegisterFontsForURL((CFURLRef)fileURL, kCTFontManagerScopeProcess, NULL);
NSCAssert(success, @"The SRG SSR font could not be registered. Please ensure only SRG Appearance registers "
"this font (check font declarations in your application Info.plist)");
BOOL success = CTFontManagerRegisterFontsForURL((CFURLRef)fileURL, kCTFontManagerScopeProcess, NULL);
if (! success) {
NSLog(@"The SRG SSR font could not be registered. Please ensure only SRG Appearance registers "
"this font (check font declarations in your application Info.plist). You can ignore this "
"message in unit tests.");
}
}
}

Expand Down
6 changes: 3 additions & 3 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# All lines starting with a # are ignored when running `fastlane`

# This is the minimum version number required.
fastlane_version '2.201.0'
fastlane_version '2.210.1'

default_platform :ios

Expand All @@ -25,9 +25,9 @@ platform :ios do
clean_result_files
clean_derived_data

iphone13 = Device.new('iOS', 'iPhone 13')
iphone14 = Device.new('iOS', 'iPhone 14')
appletv = Device.new('tvOS', 'Apple TV')
devices = [iphone13, appletv]
devices = [iphone14, appletv]

scheme = swift_package_name
swift_package_tests = TestBuild.new(scheme, '', false)
Expand Down

0 comments on commit 37858eb

Please sign in to comment.