From 3167674d708bd29138ebd7227d0d54d033cab5b6 Mon Sep 17 00:00:00 2001
From: Zev Eisenberg <zev@zeveisenberg.com>
Date: Mon, 7 Jun 2021 21:17:26 -0400
Subject: [PATCH 1/3] Linting updates. Let Xcode 12.5 update storyboard.

---
 Example-iOS/DemoStrings.swift               |  6 +-
 Example-iOS/Resources/Main.storyboard       | 56 ++++++------
 Example-iOS/StyleViewController.swift       |  4 +-
 Sources/StringStyle+Part.swift              | 96 ++++++++++-----------
 Sources/StringStyle.swift                   |  4 +-
 Sources/StylisticAlternates.swift           |  2 +-
 Sources/UIKit/TextAlignmentConstraint.swift |  2 +-
 Tests/AdaptiveStyleTests.swift              |  4 +-
 Tests/AttributedStringStyleTests.swift      | 10 +--
 Tests/FontInspectorTests.swift              |  4 +-
 10 files changed, 92 insertions(+), 96 deletions(-)

diff --git a/Example-iOS/DemoStrings.swift b/Example-iOS/DemoStrings.swift
index 12c4ea26..35a73d8b 100644
--- a/Example-iOS/DemoStrings.swift
+++ b/Example-iOS/DemoStrings.swift
@@ -9,7 +9,7 @@
 import BonMot
 import UIKit
 
-//swiftlint:disable type_body_length file_length
+// swiftlint:disable type_body_length file_length
 enum DemoStrings {
 
     // A Simple Example
@@ -434,7 +434,7 @@ enum DemoStrings {
     }()
 
 }
-//swiftlint:enable type_body_length
+// swiftlint:enable type_body_length
 
 extension DemoStrings {
 
@@ -450,4 +450,4 @@ extension DemoStrings {
 
 }
 
-//swiftlint:enable file_length
+// swiftlint:enable file_length
diff --git a/Example-iOS/Resources/Main.storyboard b/Example-iOS/Resources/Main.storyboard
index 3a054cce..725529f5 100644
--- a/Example-iOS/Resources/Main.storyboard
+++ b/Example-iOS/Resources/Main.storyboard
@@ -1,25 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13168.3" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="RMx-3f-FxP">
-    <device id="retina4_0" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="RMx-3f-FxP">
+    <device id="retina4_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13147.4"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
-        <!--Master-->
+        <!--Root-->
         <scene sceneID="pY4-Hu-kfo">
             <objects>
-                <navigationController title="Master" id="RMx-3f-FxP" sceneMemberID="viewController">
+                <navigationController title="Master" id="RMx-3f-FxP" userLabel="Root" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="Pmd-2v-anx">
-                        <rect key="frame" x="0.0" y="0.0" width="1000" height="1000"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <toolbar key="toolbar" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="iOw-qs-MyN">
-                        <rect key="frame" x="0.0" y="556" width="600" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </toolbar>
                     <connections>
@@ -43,10 +39,10 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="onDrag" translatesAutoresizingMaskIntoConstraints="NO" id="79q-T4-483">
-                                <rect key="frame" x="0.0" y="20" width="320" height="548"/>
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="VbJ-8f-5l0">
-                                        <rect key="frame" x="10" y="0.0" width="300" height="502.5"/>
+                                        <rect key="frame" x="10" y="0.0" width="300" height="505.5"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LdH-8Y-bbM">
                                                 <rect key="frame" x="0.0" y="0.0" width="300" height="30"/>
@@ -68,7 +64,7 @@
                                                 <rect key="frame" x="0.0" y="70.5" width="300" height="30"/>
                                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             </view>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ekg-tW-Obd">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ekg-tW-Obd">
                                                 <rect key="frame" x="0.0" y="110.5" width="300" height="40"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="40" id="s1E-zN-vgZ"/>
@@ -121,14 +117,14 @@
                                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             </view>
                                             <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="IPp-4q-Mck">
-                                                <rect key="frame" x="0.0" y="434.5" width="300" height="29"/>
+                                                <rect key="frame" x="0.0" y="434.5" width="300" height="32"/>
                                                 <segments>
                                                     <segment title="First"/>
                                                     <segment title="Second"/>
                                                 </segments>
                                             </segmentedControl>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GjN-qP-5Mn">
-                                                <rect key="frame" x="0.0" y="472.5" width="300" height="30"/>
+                                                <rect key="frame" x="0.0" y="475.5" width="300" height="30"/>
                                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             </view>
                                         </subviews>
@@ -184,10 +180,10 @@
                                 <rect key="frame" x="0.0" y="0.0" width="320" height="588"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="ckz-Eb-Lm2">
-                                        <rect key="frame" x="0.0" y="0.0" width="320" height="202"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="182"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Title1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ApW-Q1-6qj">
-                                                <rect key="frame" x="0.0" y="0.0" width="320" height="31.5"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="320" height="30"/>
                                                 <fontDescription key="fontDescription" style="UICTFontTextStyleTitle1"/>
                                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
@@ -196,7 +192,7 @@
                                                 </userDefinedRuntimeAttributes>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title2" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="48b-u2-7AL">
-                                                <rect key="frame" x="0.0" y="31.5" width="320" height="24"/>
+                                                <rect key="frame" x="0.0" y="30" width="320" height="23"/>
                                                 <fontDescription key="fontDescription" style="UICTFontTextStyleTitle2"/>
                                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
@@ -205,7 +201,7 @@
                                                 </userDefinedRuntimeAttributes>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title3" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kzn-n4-oy1">
-                                                <rect key="frame" x="0.0" y="55.5" width="320" height="24"/>
+                                                <rect key="frame" x="0.0" y="53" width="320" height="23"/>
                                                 <fontDescription key="fontDescription" style="UICTFontTextStyleTitle3"/>
                                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
@@ -214,7 +210,7 @@
                                                 </userDefinedRuntimeAttributes>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Headline" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IaK-GW-BYX">
-                                                <rect key="frame" x="0.0" y="79.5" width="320" height="20.5"/>
+                                                <rect key="frame" x="0.0" y="76" width="320" height="17"/>
                                                 <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
                                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
@@ -223,7 +219,7 @@
                                                 </userDefinedRuntimeAttributes>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Subheadline" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TN4-6n-fhM">
-                                                <rect key="frame" x="0.0" y="100" width="320" height="18"/>
+                                                <rect key="frame" x="0.0" y="93" width="320" height="14.5"/>
                                                 <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
@@ -232,7 +228,7 @@
                                                 </userDefinedRuntimeAttributes>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Body" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cIH-Iu-sNP">
-                                                <rect key="frame" x="0.0" y="118" width="320" height="20.5"/>
+                                                <rect key="frame" x="0.0" y="107.5" width="320" height="17"/>
                                                 <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
@@ -241,7 +237,7 @@
                                                 </userDefinedRuntimeAttributes>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Callout" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="U9K-u9-hvJ">
-                                                <rect key="frame" x="0.0" y="138.5" width="320" height="19.5"/>
+                                                <rect key="frame" x="0.0" y="124.5" width="320" height="16"/>
                                                 <fontDescription key="fontDescription" style="UICTFontTextStyleCallout"/>
                                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
@@ -250,7 +246,7 @@
                                                 </userDefinedRuntimeAttributes>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Caption1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gyi-K0-YPi">
-                                                <rect key="frame" x="0.0" y="158" width="320" height="14.5"/>
+                                                <rect key="frame" x="0.0" y="140.5" width="320" height="13.5"/>
                                                 <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
@@ -259,7 +255,7 @@
                                                 </userDefinedRuntimeAttributes>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Caption2" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5Ut-bG-5C2">
-                                                <rect key="frame" x="0.0" y="172.5" width="320" height="13.5"/>
+                                                <rect key="frame" x="0.0" y="154" width="320" height="13.5"/>
                                                 <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
                                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
@@ -268,7 +264,7 @@
                                                 </userDefinedRuntimeAttributes>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Footnote" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="R8p-GV-fho">
-                                                <rect key="frame" x="0.0" y="186" width="320" height="16"/>
+                                                <rect key="frame" x="0.0" y="167.5" width="320" height="14.5"/>
                                                 <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
@@ -310,15 +306,15 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <prototypes>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="StyleCell" rowHeight="99" id="ELc-43-2JU" customClass="MasterTableViewCell" customModule="Example_iOS" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="28" width="320" height="99"/>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="StyleCell" rowHeight="99" id="ELc-43-2JU" customClass="BaseTableViewCell" customModule="Example_iOS" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="24.5" width="320" height="99"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ELc-43-2JU" id="jMn-3r-3Ry">
-                                    <rect key="frame" x="0.0" y="0.0" width="320" height="98.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="320" height="99"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cdv-Qw-LeD">
-                                            <rect key="frame" x="23" y="23" width="274" height="37"/>
+                                            <rect key="frame" x="31" y="26" width="258" height="32"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
diff --git a/Example-iOS/StyleViewController.swift b/Example-iOS/StyleViewController.swift
index c784ab80..33a8b448 100644
--- a/Example-iOS/StyleViewController.swift
+++ b/Example-iOS/StyleViewController.swift
@@ -11,7 +11,7 @@ import UIKit
 
 /// UITableViewCell's built in labels are re-created when the content size
 /// category changes, so we use a cell subclass with a custom label to avoid this.
-class MasterTableViewCell: UITableViewCell {
+class BaseTableViewCell: UITableViewCell {
 
     @IBOutlet var titleLabel: UILabel?
 
@@ -51,7 +51,7 @@ class StyleViewController: UITableViewController {
     }
 
     func cell(at indexPath: IndexPath) -> UITableViewCell {
-        guard let cell = tableView.dequeueReusableCell(withIdentifier: "StyleCell", for: indexPath) as? MasterTableViewCell else {
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: "StyleCell", for: indexPath) as? BaseTableViewCell else {
             fatalError("Misconfigured VC")
         }
         let attributedText = styles[indexPath.section].1[indexPath.row]
diff --git a/Sources/StringStyle+Part.swift b/Sources/StringStyle+Part.swift
index 6f810f80..523fd5f0 100644
--- a/Sources/StringStyle+Part.swift
+++ b/Sources/StringStyle+Part.swift
@@ -156,8 +156,8 @@ extension StringStyle {
         return style
     }
 
-    //swiftlint:disable function_body_length
-    //swiftlint:disable cyclomatic_complexity
+    // swiftlint:disable function_body_length
+    // swiftlint:disable cyclomatic_complexity
     /// Update the style with the specified style part.
     ///
     /// - Parameter stylePart: The style part with which to update the receiver.
@@ -224,53 +224,53 @@ extension StringStyle {
             self.hyphenationFactor = hyphenationFactor
         case let .allowsDefaultTighteningForTruncation(allowsDefaultTighteningForTruncation):
             self.allowsDefaultTighteningForTruncation = allowsDefaultTighteningForTruncation
-        #if os(iOS) || os(tvOS) || os(watchOS)
-            case let .speaksPunctuation(speaksPunctuation):
-                self.speaksPunctuation = speaksPunctuation
-            case let .speakingLanguage(speakingLanguage):
-                self.speakingLanguage = speakingLanguage
-            case let .speakingPitch(speakingPitch):
-                self.speakingPitch = speakingPitch
-            case let .speakingPronunciation(speakingPronunciation):
-                self.speakingPronunciation = speakingPronunciation
-            case let .shouldQueueSpeechAnnouncement(shouldQueueSpeechAnnouncement):
-                self.shouldQueueSpeechAnnouncement = shouldQueueSpeechAnnouncement
-            case let .headingLevel(headingLevel):
-                self.headingLevel = headingLevel
-        #endif
-        #if os(OSX) || os(iOS) || os(tvOS)
-            case let .numberCase(numberCase):
-                self.numberCase = numberCase
-            case let .numberSpacing(numberSpacing):
-                self.numberSpacing = numberSpacing
-            case let .fractions(fractions):
-                self.fractions = fractions
-            case let .superscript(superscript):
-                self.superscript = superscript
-            case let .`subscript`(`subscript`):
-                self.`subscript` = `subscript`
-            case let .ordinals(ordinals):
-                self.ordinals = ordinals
-            case let .scientificInferiors(scientificInferiors):
-                self.scientificInferiors = scientificInferiors
-            case let .smallCaps(smallCaps):
-                self.smallCaps.insert(smallCaps)
-            case let .stylisticAlternates(stylisticAlternates):
-                self.stylisticAlternates.add(other: stylisticAlternates)
-            case let .contextualAlternates(contextualAlternates):
-                self.contextualAlternates.add(other: contextualAlternates)
-            case let .fontFeature(featureProvider):
-                self.fontFeatureProviders.append(featureProvider)
-        #endif
-        #if os(iOS) || os(tvOS)
-            case let .adapt(style):
-                self.adaptations.append(style)
-            case let .textStyle(textStyle):
-                self.font = UIFont.bon_preferredFont(forTextStyle: textStyle, compatibleWith: nil)
-        #endif
+#if os(iOS) || os(tvOS) || os(watchOS)
+        case let .speaksPunctuation(speaksPunctuation):
+            self.speaksPunctuation = speaksPunctuation
+        case let .speakingLanguage(speakingLanguage):
+            self.speakingLanguage = speakingLanguage
+        case let .speakingPitch(speakingPitch):
+            self.speakingPitch = speakingPitch
+        case let .speakingPronunciation(speakingPronunciation):
+            self.speakingPronunciation = speakingPronunciation
+        case let .shouldQueueSpeechAnnouncement(shouldQueueSpeechAnnouncement):
+            self.shouldQueueSpeechAnnouncement = shouldQueueSpeechAnnouncement
+        case let .headingLevel(headingLevel):
+            self.headingLevel = headingLevel
+#endif
+#if os(OSX) || os(iOS) || os(tvOS)
+        case let .numberCase(numberCase):
+            self.numberCase = numberCase
+        case let .numberSpacing(numberSpacing):
+            self.numberSpacing = numberSpacing
+        case let .fractions(fractions):
+            self.fractions = fractions
+        case let .superscript(superscript):
+            self.superscript = superscript
+        case let .`subscript`(`subscript`):
+            self.`subscript` = `subscript`
+        case let .ordinals(ordinals):
+            self.ordinals = ordinals
+        case let .scientificInferiors(scientificInferiors):
+            self.scientificInferiors = scientificInferiors
+        case let .smallCaps(smallCaps):
+            self.smallCaps.insert(smallCaps)
+        case let .stylisticAlternates(stylisticAlternates):
+            self.stylisticAlternates.add(other: stylisticAlternates)
+        case let .contextualAlternates(contextualAlternates):
+            self.contextualAlternates.add(other: contextualAlternates)
+        case let .fontFeature(featureProvider):
+            self.fontFeatureProviders.append(featureProvider)
+#endif
+#if os(iOS) || os(tvOS)
+        case let .adapt(style):
+            self.adaptations.append(style)
+        case let .textStyle(textStyle):
+            self.font = UIFont.bon_preferredFont(forTextStyle: textStyle, compatibleWith: nil)
+#endif
         }
     }
-    //swiftlint:enable function_body_length
-    //swiftlint:enable cyclomatic_complexity
+    // swiftlint:enable function_body_length
+    // swiftlint:enable cyclomatic_complexity
 
 }
diff --git a/Sources/StringStyle.swift b/Sources/StringStyle.swift
index 61210f74..538990d1 100644
--- a/Sources/StringStyle.swift
+++ b/Sources/StringStyle.swift
@@ -375,7 +375,7 @@ public extension StringStyle {
 
 extension NSParagraphStyle {
 
-    //swiftlint:disable cyclomatic_complexity
+    // swiftlint:disable cyclomatic_complexity
     /// Update the passed `NSParagraphStyle`'s properties with the value in this
     /// the receiver (only if the supplied `NSParagraphStyle`'s value for a
     /// given property is the default value).
@@ -402,7 +402,7 @@ extension NSParagraphStyle {
         if paragraph.allowsDefaultTighteningForTruncation == defaults.allowsDefaultTighteningForTruncation { paragraph.allowsDefaultTighteningForTruncation = allowsDefaultTighteningForTruncation }
         return paragraph
     }
-    //swiftlint:enable cyclomatic_complexity
+    // swiftlint:enable cyclomatic_complexity
 
 }
 
diff --git a/Sources/StylisticAlternates.swift b/Sources/StylisticAlternates.swift
index 639503bb..fe642d97 100644
--- a/Sources/StylisticAlternates.swift
+++ b/Sources/StylisticAlternates.swift
@@ -209,7 +209,7 @@
 
     extension StylisticAlternates: FontFeatureProvider {
 
-        //swiftlint:disable:next cyclomatic_complexity
+        // swiftlint:disable:next cyclomatic_complexity
         public func featureSettings() -> [(type: Int, selector: Int)] {
             var selectors = [Int]()
 
diff --git a/Sources/UIKit/TextAlignmentConstraint.swift b/Sources/UIKit/TextAlignmentConstraint.swift
index 7facdf9f..8617b978 100644
--- a/Sources/UIKit/TextAlignmentConstraint.swift
+++ b/Sources/UIKit/TextAlignmentConstraint.swift
@@ -173,7 +173,7 @@ public class TextAlignmentConstraint: NSLayoutConstraint {
     }
 
     // Can't use block-based KVO until we can use \NSLayoutConstraint.firstItem
-    //swiftlint:disable:next block_based_kvo
+    // swiftlint:disable:next block_based_kvo
     public override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey: Any]?, context: UnsafeMutableRawPointer?) {
         guard context == &TextAlignmentConstraintKVOContext else {
             super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context)
diff --git a/Tests/AdaptiveStyleTests.swift b/Tests/AdaptiveStyleTests.swift
index 769c3e77..93a56ebb 100644
--- a/Tests/AdaptiveStyleTests.swift
+++ b/Tests/AdaptiveStyleTests.swift
@@ -16,7 +16,7 @@ import XCTest
 let defaultTraitCollection = UITraitCollection(preferredContentSizeCategory: UIContentSizeCategory.large)
 
 // These tests rely on iOS 10.0 APIs. Test method needs to be updated to run on iOS 9.0
-//swiftlint:disable type_body_length
+// swiftlint:disable type_body_length
 @available(iOS 10.0, *)
 class AdaptiveStyleTests: XCTestCase {
 
@@ -293,7 +293,7 @@ class AdaptiveStyleTests: XCTestCase {
             }
         }
     }
-    //swiftlint:enable function_body_length
+    // swiftlint:enable function_body_length
 
     func testTabAdaptation() {
         func firstTabLocation(attributedString string: NSAttributedString) -> CGFloat {
diff --git a/Tests/AttributedStringStyleTests.swift b/Tests/AttributedStringStyleTests.swift
index 9657b93b..6190a8eb 100644
--- a/Tests/AttributedStringStyleTests.swift
+++ b/Tests/AttributedStringStyleTests.swift
@@ -10,8 +10,8 @@
 import CoreText
 import XCTest
 
-//swiftlint:disable file_length
-//swiftlint:disable:next type_body_length
+// swiftlint:disable file_length
+// swiftlint:disable:next type_body_length
 class StringStyleTests: XCTestCase {
 
     override func setUp() {
@@ -557,7 +557,7 @@ class StringStyleTests: XCTestCase {
 
     static let floatingPointPropertiesLine = #line
     static let floatingPointProperties: [(NSParagraphStyle) -> CGFloat] = [
-        //swiftlint:disable opening_brace
+        // swiftlint:disable opening_brace
         \.lineSpacing,
         \.paragraphSpacing,
         \.headIndent,
@@ -568,7 +568,7 @@ class StringStyleTests: XCTestCase {
         \.lineHeightMultiple,
         \.paragraphSpacingBefore,
         { CGFloat($0.hyphenationFactor) },
-        //swiftlint:enable opening_brace
+        // swiftlint:enable opening_brace
     ]
 
     func testParagraphStyles() {
@@ -768,4 +768,4 @@ private extension StringStyleTests {
 
 }
 
-//swiftlint:enable file_length
+// swiftlint:enable file_length
diff --git a/Tests/FontInspectorTests.swift b/Tests/FontInspectorTests.swift
index ca4ab8b4..61fc766d 100644
--- a/Tests/FontInspectorTests.swift
+++ b/Tests/FontInspectorTests.swift
@@ -29,7 +29,7 @@ class FontInspectorTests: XCTestCase {
         XCTAssertTrue(garamond.has(feature: NumberCase.lower))
     }
 
-    //swiftlint:disable function_body_length
+    // swiftlint:disable function_body_length
     /// This test is disabled on macOS because, although it works locally,
     /// the font reports _slightly_ different feature availability on the build
     /// machine. Perhaps it is installed on the build machine? Possible fix: use
@@ -121,6 +121,6 @@ class FontInspectorTests: XCTestCase {
             ].joined(separator: "\n")
         XCTAssertEqual(garamond.availableFontFeatures(includeIdentifiers: false), garamondControlString)
     }
-    //swiftlint:enable function_body_length
+    // swiftlint:enable function_body_length
 
 }

From 9d71cf9720d06c72c322340e209248ea4043a289 Mon Sep 17 00:00:00 2001
From: Zev Eisenberg <zev@zeveisenberg.com>
Date: Mon, 7 Jun 2021 21:17:36 -0400
Subject: [PATCH 2/3] Let Xcode 12.5 udpate project.

---
 BonMot.xcodeproj/project.pbxproj | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/BonMot.xcodeproj/project.pbxproj b/BonMot.xcodeproj/project.pbxproj
index fa1c58ad..ca115d13 100644
--- a/BonMot.xcodeproj/project.pbxproj
+++ b/BonMot.xcodeproj/project.pbxproj
@@ -783,7 +783,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = Rightpoint;
 				TargetAttributes = {
 					AB8497DA1DA45B9C00FE3414 = {
@@ -1468,6 +1468,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;
@@ -1531,6 +1532,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;

From b5f6aa44929405daff71689c9e93fc396e30ae5f Mon Sep 17 00:00:00 2001
From: Zev Eisenberg <zev@zeveisenberg.com>
Date: Mon, 7 Jun 2021 21:18:01 -0400
Subject: [PATCH 3/3] Let Xcode 12.5 update schemes.

---
 .../xcschemes/AllTheThings.xcscheme           | 10 ++-----
 .../xcschemes/BonMot-OSX.xcscheme             |  2 +-
 .../xcschemes/BonMot-OSXTests.xcscheme        |  2 +-
 .../xcschemes/BonMot-iOS.xcscheme             |  2 +-
 .../xcschemes/BonMot-iOSTests.xcscheme        |  2 +-
 .../xcschemes/BonMot-tvOS.xcscheme            |  2 +-
 .../xcschemes/BonMot-tvOSTests.xcscheme       |  2 +-
 .../xcschemes/BonMot-watchOS.xcscheme         | 28 ++++++++-----------
 .../xcschemes/Example-iOS.xcscheme            | 14 ++++------
 9 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/BonMot.xcodeproj/xcshareddata/xcschemes/AllTheThings.xcscheme b/BonMot.xcodeproj/xcshareddata/xcschemes/AllTheThings.xcscheme
index 74d4f665..6b59f3c4 100644
--- a/BonMot.xcodeproj/xcshareddata/xcschemes/AllTheThings.xcscheme
+++ b/BonMot.xcodeproj/xcshareddata/xcschemes/AllTheThings.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,12 +26,10 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -52,8 +50,6 @@
             ReferencedContainer = "container:BonMot.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-OSX.xcscheme b/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-OSX.xcscheme
index a8299ce6..07276974 100644
--- a/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-OSX.xcscheme
+++ b/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-OSX.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1250"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-OSXTests.xcscheme b/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-OSXTests.xcscheme
index 718e405a..cd8ea38d 100644
--- a/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-OSXTests.xcscheme
+++ b/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-OSXTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1250"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-iOS.xcscheme b/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-iOS.xcscheme
index eb6193f0..54949156 100644
--- a/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-iOS.xcscheme
+++ b/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1250"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-iOSTests.xcscheme b/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-iOSTests.xcscheme
index 423f25f6..8ae9a9a7 100644
--- a/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-iOSTests.xcscheme
+++ b/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-iOSTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1250"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-tvOS.xcscheme b/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-tvOS.xcscheme
index 45adb2e6..b0641a77 100644
--- a/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-tvOS.xcscheme
+++ b/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1250"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-tvOSTests.xcscheme b/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-tvOSTests.xcscheme
index 5427e185..e7cc81f5 100644
--- a/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-tvOSTests.xcscheme
+++ b/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-tvOSTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1250"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-watchOS.xcscheme b/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-watchOS.xcscheme
index 76eac952..edac6462 100644
--- a/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-watchOS.xcscheme
+++ b/BonMot.xcodeproj/xcshareddata/xcschemes/BonMot-watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "ABA75DCC1D99E10400B64705"
+            BuildableName = "BonMot.framework"
+            BlueprintName = "BonMot-watchOS"
+            ReferencedContainer = "container:BonMot.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO"
@@ -42,17 +51,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "ABA75DCC1D99E10400B64705"
-            BuildableName = "BonMot.framework"
-            BlueprintName = "BonMot-watchOS"
-            ReferencedContainer = "container:BonMot.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -73,8 +71,6 @@
             ReferencedContainer = "container:BonMot.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/BonMot.xcodeproj/xcshareddata/xcschemes/Example-iOS.xcscheme b/BonMot.xcodeproj/xcshareddata/xcschemes/Example-iOS.xcscheme
index 7bbb9c9f..b698fafd 100644
--- a/BonMot.xcodeproj/xcshareddata/xcschemes/Example-iOS.xcscheme
+++ b/BonMot.xcodeproj/xcshareddata/xcschemes/Example-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,10 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -39,8 +37,8 @@
             ReferencedContainer = "container:BonMot.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -62,8 +60,6 @@
             ReferencedContainer = "container:BonMot.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"