Skip to content

Commit fa2a3d8

Browse files
malcommacmalcommac
committed
Merge branch 'release/3.0.2'
2 parents 37d5027 + e5c147f commit fa2a3d8

File tree

8 files changed

+53
-66
lines changed

8 files changed

+53
-66
lines changed

‎ExampleTvOS/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1414
var window: UIWindow?
1515

1616

17-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
17+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
1818
// Override point for customization after application launch.
1919
return true
2020
}

‎ExampleWatchOS/Assets.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,6 @@
7272
"idiom" : "watch-marketing",
7373
"size" : "1024x1024",
7474
"scale" : "1x"
75-
},
76-
{
77-
"size" : "44x44",
78-
"idiom" : "watch",
79-
"scale" : "2x",
80-
"role" : "longLook",
81-
"subtype" : "42mm"
8275
}
8376
],
8477
"info" : {

‎Sources/SwiftRichString/Attributes/FontConvertible.swift‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,12 @@ extension Font: FontConvertible {
5959
public func font(size: CGFloat?) -> Font {
6060
#if os(tvOS)
6161
return Font(name: self.fontName, size: (size ?? TVOS_SYSTEMFONT_SIZE))!
62+
#elseif os(iOS)
63+
return Font(name: self.fontName, size: (size ?? TVOS_SYSTEMFONT_SIZE))!
6264
#elseif os(watchOS)
6365
return Font(name: self.fontName, size: (size ?? WATCHOS_SYSTEMFONT_SIZE))!
64-
#else
65-
return Font(descriptor: self.fontDescriptor, size: (size ?? Font.systemFontSize))
66+
#elseif os(macOS)
67+
return Font(descriptor: self.fontDescriptor, size: (size ?? Font.systemFontSize))!
6668
#endif
6769
}
6870

‎SwiftRichString.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -878,7 +878,7 @@
878878
isa = PBXProject;
879879
attributes = {
880880
LastSwiftUpdateCheck = 0930;
881-
LastUpgradeCheck = 1020;
881+
LastUpgradeCheck = 1100;
882882
ORGANIZATIONNAME = SwiftRichString;
883883
TargetAttributes = {
884884
52D6D97B1BEFF229002C0205 = {
@@ -904,6 +904,7 @@
904904
64507EDA20B18F0F009455BD = {
905905
CreatedOnToolsVersion = 9.3.1;
906906
DevelopmentTeam = E5DU3FA699;
907+
LastSwiftMigration = 1100;
907908
ProvisioningStyle = Automatic;
908909
};
909910
64507EFD20B1911A009455BD = {
@@ -926,6 +927,7 @@
926927
648932F4209DE6C5000E691A = {
927928
CreatedOnToolsVersion = 9.3;
928929
DevelopmentTeam = E5DU3FA699;
930+
LastSwiftMigration = 1100;
929931
ProvisioningStyle = Automatic;
930932
};
931933
DD7502791C68FCFC006590AF = {
@@ -1741,6 +1743,7 @@
17411743
PRODUCT_NAME = "$(TARGET_NAME)";
17421744
SDKROOT = appletvos;
17431745
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
1746+
SWIFT_VERSION = 5.0;
17441747
TARGETED_DEVICE_FAMILY = 3;
17451748
TVOS_DEPLOYMENT_TARGET = 10.0;
17461749
};
@@ -1766,6 +1769,7 @@
17661769
PRODUCT_NAME = "$(TARGET_NAME)";
17671770
SDKROOT = appletvos;
17681771
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1772+
SWIFT_VERSION = 5.0;
17691773
TARGETED_DEVICE_FAMILY = 3;
17701774
TVOS_DEPLOYMENT_TARGET = 10.0;
17711775
};
@@ -1952,6 +1956,7 @@
19521956
CODE_SIGN_STYLE = Automatic;
19531957
COMBINE_HIDPI_IMAGES = YES;
19541958
DEVELOPMENT_TEAM = E5DU3FA699;
1959+
ENABLE_HARDENED_RUNTIME = YES;
19551960
GCC_C_LANGUAGE_STANDARD = gnu11;
19561961
INFOPLIST_FILE = ExampleMac/Info.plist;
19571962
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
@@ -1960,6 +1965,7 @@
19601965
PRODUCT_NAME = "$(TARGET_NAME)";
19611966
SDKROOT = macosx;
19621967
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
1968+
SWIFT_VERSION = 5.0;
19631969
};
19641970
name = Debug;
19651971
};
@@ -1980,6 +1986,7 @@
19801986
CODE_SIGN_STYLE = Automatic;
19811987
COMBINE_HIDPI_IMAGES = YES;
19821988
DEVELOPMENT_TEAM = E5DU3FA699;
1989+
ENABLE_HARDENED_RUNTIME = YES;
19831990
GCC_C_LANGUAGE_STANDARD = gnu11;
19841991
INFOPLIST_FILE = ExampleMac/Info.plist;
19851992
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
@@ -1988,6 +1995,7 @@
19881995
PRODUCT_NAME = "$(TARGET_NAME)";
19891996
SDKROOT = macosx;
19901997
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1998+
SWIFT_VERSION = 5.0;
19911999
};
19922000
name = Release;
19932001
};

‎SwiftRichString.xcodeproj/xcshareddata/xcschemes/SwiftRichString-iOS.xcscheme‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
codeCoverageEnabled = "YES"
30-
shouldUseLaunchSchemeArgsEnv = "YES">
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES">
31+
<MacroExpansion>
32+
<BuildableReference
33+
BuildableIdentifier = "primary"
34+
BlueprintIdentifier = "52D6D97B1BEFF229002C0205"
35+
BuildableName = "SwiftRichString.framework"
36+
BlueprintName = "SwiftRichString-iOS"
37+
ReferencedContainer = "container:SwiftRichString.xcodeproj">
38+
</BuildableReference>
39+
</MacroExpansion>
3140
<Testables>
3241
<TestableReference
3342
skipped = "NO">
@@ -40,17 +49,6 @@
4049
</BuildableReference>
4150
</TestableReference>
4251
</Testables>
43-
<MacroExpansion>
44-
<BuildableReference
45-
BuildableIdentifier = "primary"
46-
BlueprintIdentifier = "52D6D97B1BEFF229002C0205"
47-
BuildableName = "SwiftRichString.framework"
48-
BlueprintName = "SwiftRichString-iOS"
49-
ReferencedContainer = "container:SwiftRichString.xcodeproj">
50-
</BuildableReference>
51-
</MacroExpansion>
52-
<AdditionalOptions>
53-
</AdditionalOptions>
5452
</TestAction>
5553
<LaunchAction
5654
buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
7169
ReferencedContainer = "container:SwiftRichString.xcodeproj">
7270
</BuildableReference>
7371
</MacroExpansion>
74-
<AdditionalOptions>
75-
</AdditionalOptions>
7672
</LaunchAction>
7773
<ProfileAction
7874
buildConfiguration = "Release"

‎SwiftRichString.xcodeproj/xcshareddata/xcschemes/SwiftRichString-macOS.xcscheme‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
codeCoverageEnabled = "YES"
30-
shouldUseLaunchSchemeArgsEnv = "YES">
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES">
31+
<MacroExpansion>
32+
<BuildableReference
33+
BuildableIdentifier = "primary"
34+
BlueprintIdentifier = "52D6DA0E1BF000BD002C0205"
35+
BuildableName = "SwiftRichString.framework"
36+
BlueprintName = "SwiftRichString-macOS"
37+
ReferencedContainer = "container:SwiftRichString.xcodeproj">
38+
</BuildableReference>
39+
</MacroExpansion>
3140
<Testables>
3241
<TestableReference
3342
skipped = "NO">
@@ -40,17 +49,6 @@
4049
</BuildableReference>
4150
</TestableReference>
4251
</Testables>
43-
<MacroExpansion>
44-
<BuildableReference
45-
BuildableIdentifier = "primary"
46-
BlueprintIdentifier = "52D6DA0E1BF000BD002C0205"
47-
BuildableName = "SwiftRichString.framework"
48-
BlueprintName = "SwiftRichString-macOS"
49-
ReferencedContainer = "container:SwiftRichString.xcodeproj">
50-
</BuildableReference>
51-
</MacroExpansion>
52-
<AdditionalOptions>
53-
</AdditionalOptions>
5452
</TestAction>
5553
<LaunchAction
5654
buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
7169
ReferencedContainer = "container:SwiftRichString.xcodeproj">
7270
</BuildableReference>
7371
</MacroExpansion>
74-
<AdditionalOptions>
75-
</AdditionalOptions>
7672
</LaunchAction>
7773
<ProfileAction
7874
buildConfiguration = "Release"

‎SwiftRichString.xcodeproj/xcshareddata/xcschemes/SwiftRichString-tvOS.xcscheme‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
codeCoverageEnabled = "YES"
30-
shouldUseLaunchSchemeArgsEnv = "YES">
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES">
31+
<MacroExpansion>
32+
<BuildableReference
33+
BuildableIdentifier = "primary"
34+
BlueprintIdentifier = "52D6D9EF1BEFFFBE002C0205"
35+
BuildableName = "SwiftRichString.framework"
36+
BlueprintName = "SwiftRichString-tvOS"
37+
ReferencedContainer = "container:SwiftRichString.xcodeproj">
38+
</BuildableReference>
39+
</MacroExpansion>
3140
<Testables>
3241
<TestableReference
3342
skipped = "NO">
@@ -40,17 +49,6 @@
4049
</BuildableReference>
4150
</TestableReference>
4251
</Testables>
43-
<MacroExpansion>
44-
<BuildableReference
45-
BuildableIdentifier = "primary"
46-
BlueprintIdentifier = "52D6D9EF1BEFFFBE002C0205"
47-
BuildableName = "SwiftRichString.framework"
48-
BlueprintName = "SwiftRichString-tvOS"
49-
ReferencedContainer = "container:SwiftRichString.xcodeproj">
50-
</BuildableReference>
51-
</MacroExpansion>
52-
<AdditionalOptions>
53-
</AdditionalOptions>
5452
</TestAction>
5553
<LaunchAction
5654
buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
7169
ReferencedContainer = "container:SwiftRichString.xcodeproj">
7270
</BuildableReference>
7371
</MacroExpansion>
74-
<AdditionalOptions>
75-
</AdditionalOptions>
7672
</LaunchAction>
7773
<ProfileAction
7874
buildConfiguration = "Release"

‎SwiftRichString.xcodeproj/xcshareddata/xcschemes/SwiftRichString-watchOS.xcscheme‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,12 +26,10 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
codeCoverageEnabled = "YES"
30-
shouldUseLaunchSchemeArgsEnv = "YES">
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES">
3131
<Testables>
3232
</Testables>
33-
<AdditionalOptions>
34-
</AdditionalOptions>
3533
</TestAction>
3634
<LaunchAction
3735
buildConfiguration = "Debug"
@@ -52,8 +50,6 @@
5250
ReferencedContainer = "container:SwiftRichString.xcodeproj">
5351
</BuildableReference>
5452
</MacroExpansion>
55-
<AdditionalOptions>
56-
</AdditionalOptions>
5753
</LaunchAction>
5854
<ProfileAction
5955
buildConfiguration = "Release"

0 commit comments

Comments
 (0)