wordpress-mobile · SergioEstevao · Oct 1, 2019 · Sep 4, 2019 · Sep 23, 2019 · Sep 23, 2019
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,31 +2,31 @@ version: 2.1
 
 orbs:
   # This uses the iOS Orb located at https://github.com/wordpress-mobile/circleci-orbs
-  ios: wordpress-mobile/ios@0.0.25
+  ios: wordpress-mobile/ios@0.0.32
 
 workflows:
   test_and_validate:
     jobs:
       - ios/test:
           name: Test
-          xcode-version: "10.2.0"
+          xcode-version: "11.0"
           carthage-update: true
           carthage-working-directory: Example
           bundle-install: false
           pod-install: false
           workspace: Aztec.xcworkspace
           scheme: AztecExample
-          device: iPhone XS
-          ios-version: "12.2"
+          device: iPhone 11
+          ios-version: "13.0"
 
       - ios/validate-podspec:
           name: Validate WordPress-Aztec-iOS.podspec
-          xcode-version: "10.2.0"
+          xcode-version: "11.0"
           podspec-path: WordPress-Aztec-iOS.podspec
 
       - ios/validate-podspec:
           name: Validate WordPress-Editor-iOS.podspec
-          xcode-version: "10.2.0"
+          xcode-version: "11.0"
           podspec-path: WordPress-Editor-iOS.podspec
           # Updating specs is needed since WordPress-Editor-iOS depends on WordPress-Aztec-iOS
           update-specs-repo: true
diff --git a/Aztec.xcodeproj/project.pbxproj b/Aztec.xcodeproj/project.pbxproj
@@ -1435,12 +1435,12 @@
 					5951CB8D1D8BC93600E1866F = {
 						CreatedOnToolsVersion = 8.0;
 						DevelopmentTeam = PZYM8XX95Q;
-						LastSwiftMigration = 1010;
+						LastSwiftMigration = 1100;
 						ProvisioningStyle = Manual;
 					};
 					5951CB961D8BC93600E1866F = {
 						CreatedOnToolsVersion = 8.0;
-						LastSwiftMigration = 1010;
+						LastSwiftMigration = 1100;
 						ProvisioningStyle = Automatic;
 					};
 					E8CE3EFE1F213AAA003254AB = {
@@ -1899,7 +1899,7 @@
 				SKIP_INSTALL = YES;
 				STRIP_INSTALLED_PRODUCT = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
@@ -1927,7 +1927,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				STRIP_INSTALLED_PRODUCT = NO;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;
@@ -1947,7 +1947,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.wordpress.AztecTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1965,7 +1965,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.wordpress.AztecTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -2100,7 +2100,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				STRIP_INSTALLED_PRODUCT = NO;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Profiling;
@@ -2119,7 +2119,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.wordpress.AztecTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Profiling;
 		};
@@ -2214,7 +2214,7 @@
 				SKIP_INSTALL = YES;
 				STRIP_INSTALLED_PRODUCT = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = "Release-Alpha";
@@ -2234,7 +2234,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.wordpress.AztecTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = "Release-Alpha";
 		};

diff --git a/Aztec/Classes/EditorView/EditorView.swift b/Aztec/Classes/EditorView/EditorView.swift
@@ -323,7 +323,7 @@ extension EditorView: UITextInput {
         }
 
         set {
-            activeView.selectedTextRange = selectedTextRange
+            activeView.selectedTextRange = newValue
         }
     }
 }

diff --git a/Aztec/Classes/Extensions/Array+Attribute.swift b/Aztec/Classes/Extensions/Array+Attribute.swift
@@ -22,7 +22,7 @@ public extension Array where Element == Attribute {
     }
 
     mutating func set(_ value: Attribute.Value, for name: String) {
-        guard let attributeIndex = index(where: { $0.name == name }) else {
+        guard let attributeIndex = firstIndex(where: { $0.name == name }) else {
             let newAttribute = Attribute(name: name, value: value)
 
             append(newAttribute)
@@ -33,7 +33,7 @@ public extension Array where Element == Attribute {
     }
 
     mutating func remove(named name: String) {
-        guard let attributeIndex = index(where: { $0.name == name }) else {
+        guard let attributeIndex = firstIndex(where: { $0.name == name }) else {
             return
         }
 

diff --git a/Aztec/Classes/Extensions/Array+ShortcodeAttribute.swift b/Aztec/Classes/Extensions/Array+ShortcodeAttribute.swift
@@ -15,7 +15,7 @@ public extension Array where Element == ShortcodeAttribute {
     mutating func set(_ value: ShortcodeAttribute.Value, forKey key: String) {
         let newAttribute = ShortcodeAttribute(key: key, value: value)
 
-        guard let attributeIndex = index(where: { $0.key == key }) else {
+        guard let attributeIndex = firstIndex(where: { $0.key == key }) else {
             append(newAttribute)
             return
         }
@@ -24,7 +24,7 @@ public extension Array where Element == ShortcodeAttribute {
     }
 
     mutating func remove(key: String) {
-        guard let attributeIndex = index(where: { $0.key == key }) else {
+        guard let attributeIndex = firstIndex(where: { $0.key == key }) else {
             return
         }
 

diff --git a/Aztec/Classes/Formatters/Implementations/UnderlineFormatter.swift b/Aztec/Classes/Formatters/Implementations/UnderlineFormatter.swift
@@ -8,3 +8,15 @@ class UnderlineFormatter: StandardAttributeFormatter {
                    htmlRepresentationKey: .underlineHtmlRepresentation)
     }
 }
+
+class SpanUnderlineFormatter: UnderlineFormatter {
+
+    override func apply(to attributes: [NSAttributedString.Key : Any], andStore representation: HTMLRepresentation?) -> [NSAttributedString.Key : Any] {
+
+        let cssAttribute = CSSAttribute.underline
+        let underlineStyleAttribute = Attribute(type: .style, value: .inlineCss([cssAttribute]))
+        let spanRepresentation = HTMLElementRepresentation(ElementNode.init(type: .span, attributes: [underlineStyleAttribute], children: []))
+
+        return super.apply(to: attributes, andStore: HTMLRepresentation(for: .element(spanRepresentation)))        
+    }
+}
diff --git a/Aztec/Classes/GUI/FormatBar/FormatBar.swift b/Aztec/Classes/GUI/FormatBar/FormatBar.swift
@@ -712,6 +712,8 @@ private extension FormatBar {
                 constant: 0
             )
             self.overflowToggleItemRTLLeadingConstraint = overflowLeadingConstraint
+        @unknown default:
+            overflowLeadingConstraint = overflowToggleItem.leadingAnchor.constraint(greaterThanOrEqualTo: scrollableStackView.trailingAnchor)
         }
 
         ///Trailing item
@@ -726,6 +728,8 @@ private extension FormatBar {
             trailingItemLeadingConstraint = trailingItemContainer.leadingAnchor.constraint(greaterThanOrEqualTo: scrollableStackView.trailingAnchor)
         case .rightToLeft:
             trailingItemLeadingConstraint = trailingItemContainer.leadingAnchor.constraint(greaterThanOrEqualTo: scrollableStackView.leadingAnchor)
+        @unknown default:
+            trailingItemLeadingConstraint = trailingItemContainer.leadingAnchor.constraint(greaterThanOrEqualTo: scrollableStackView.trailingAnchor)
         }
 
         NSLayoutConstraint.activate([

diff --git a/Aztec/Classes/Libxml2/DOM/Data/ElementNode.swift b/Aztec/Classes/Libxml2/DOM/Data/ElementNode.swift
@@ -115,7 +115,7 @@ public class ElementNode: Node {
     private func updateParentForChildren() {
         for child in children where child.parent !== self {
             if let oldParent = child.parent,
-                let childIndex = oldParent.children.index(where: { child === $0 }) {
+                let childIndex = oldParent.children.firstIndex(where: { child === $0 }) {
 
                 oldParent.children.remove(at: childIndex)
             }
@@ -349,7 +349,7 @@ public class ElementNode: Node {
     /// - Returns: the index of the specified child node.
     ///
     func indexOf(childNode: Node) -> Int {
-        guard let index = children.index(where: { childNode === $0 } ) else {
+        guard let index = children.firstIndex(where: { childNode === $0 } ) else {
             fatalError("Broken parent-child relationship found.")
         }
 

diff --git a/Aztec/Classes/Libxml2/DOM/Data/Node.swift b/Aztec/Classes/Libxml2/DOM/Data/Node.swift
@@ -167,7 +167,7 @@ public class Node: Equatable, CustomReflectable, Hashable {
             return nil
         }
 
-        let index = parent.children.index { node -> Bool in
+        let index = parent.children.firstIndex { node -> Bool in
             return node === self
         }!
 

diff --git a/Aztec/Classes/NSAttributedString/Conversions/AttributedStringParser.swift b/Aztec/Classes/NSAttributedString/Conversions/AttributedStringParser.swift
@@ -333,7 +333,7 @@ private extension AttributedStringParser {
         var nonDuplicates = [ElementNode]()
 
         for node in previous where current.contains(node) {
-            guard let index = current.index(of: node) else {
+            guard let index = current.firstIndex(of: node) else {
                 continue
             }
 

diff --git a/Aztec/Classes/TextKit/ParagraphStyle.swift b/Aztec/Classes/TextKit/ParagraphStyle.swift
@@ -181,7 +181,7 @@ open class ParagraphStyle: NSMutableParagraphStyle, CustomReflectable {
     public var blockquoteIndent: CGFloat {
         let blockquoteIndex = properties.filter({ property in
             return property is Blockquote || property is TextList
-        }).index(where: { property in
+        }).firstIndex(where: { property in
             return property is Blockquote
         })
 

diff --git a/Aztec/Classes/TextKit/TextView.swift b/Aztec/Classes/TextKit/TextView.swift
@@ -418,7 +418,7 @@ open class TextView: UITextView {
         }
         storage.attachmentsDelegate = self
         font = defaultFont
-        linkTextAttributes = [.underlineStyle: NSNumber(value: NSUnderlineStyle.single.rawValue), .foregroundColor: self.tintColor]
+        linkTextAttributes = [.underlineStyle: NSNumber(value: NSUnderlineStyle.single.rawValue), .foregroundColor: tintColor as Any]
         typingAttributes = defaultAttributes
         setupMenuController()
         setupAttachmentTouchDetection()
@@ -747,7 +747,7 @@ open class TextView: UITextView {
     private static let formatterMap: [FormattingIdentifier: AttributeFormatter] = [
         .bold: BoldFormatter(),
         .italic: ItalicFormatter(),
-        .underline: UnderlineFormatter(),
+        .underline: SpanUnderlineFormatter(),
         .strikethrough: StrikethroughFormatter(),
         .link: LinkFormatter(),
         .orderedlist: TextListFormatter(style: .ordered),
@@ -935,7 +935,7 @@ open class TextView: UITextView {
     /// - Parameter range: The NSRange to edit.
     ///
     open func toggleUnderline(range: NSRange) {
-        let formatter = UnderlineFormatter()
+        let formatter = SpanUnderlineFormatter()
         toggle(formatter: formatter, atRange: range)
     }
 
@@ -1342,8 +1342,7 @@ open class TextView: UITextView {
     open func replaceWithImage(at range: NSRange, sourceURL url: URL, placeHolderImage: UIImage?, identifier: String = UUID().uuidString) -> ImageAttachment {
         let attachment = ImageAttachment(identifier: identifier, url: url)
         attachment.delegate = storage
-        attachment.image = placeHolderImage
-        attachment.alignment = .none
+        attachment.image = placeHolderImage        
         replace(at: range, with: attachment)
         return attachment
     }

diff --git a/AztecTests/Resources/UIImageResizeImage1_2x.png.dat b/AztecTests/Resources/UIImageResizeImage1_2x.png.dat
diff --git a/AztecTests/Resources/UIImageResizeImage2_2x.png.dat b/AztecTests/Resources/UIImageResizeImage2_2x.png.dat
diff --git a/Example/AztecExample.xcodeproj/project.pbxproj b/Example/AztecExample.xcodeproj/project.pbxproj
@@ -362,12 +362,12 @@
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
 						DevelopmentTeam = PZYM8XX95Q;
-						LastSwiftMigration = 1010;
+						LastSwiftMigration = 1100;
 						ProvisioningStyle = Manual;
 					};
 					CC400F161E9EC04200859AB4 = {
 						CreatedOnToolsVersion = 8.3.1;
-						LastSwiftMigration = 1010;
+						LastSwiftMigration = 1100;
 						ProvisioningStyle = Automatic;
 						TestTargetID = 607FACCF1AFB9204008FA782;
 					};
@@ -664,7 +664,7 @@
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "Aztec Example Development";
 				STRIP_INSTALLED_PRODUCT = NO;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -687,7 +687,7 @@
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "Aztec Example Ad Hoc";
 				STRIP_INSTALLED_PRODUCT = NO;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -704,7 +704,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = WP.AztecUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TEST_TARGET_NAME = AztecExample;
 			};
 			name = Debug;
@@ -719,7 +719,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = WP.AztecUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TEST_TARGET_NAME = AztecExample;
 			};
 			name = "Release-Alpha";
@@ -734,7 +734,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = WP.AztecUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TEST_TARGET_NAME = AztecExample;
 			};
 			name = Release;
@@ -749,7 +749,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = WP.AztecUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TEST_TARGET_NAME = AztecExample;
 			};
 			name = Profiling;
@@ -826,7 +826,7 @@
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "Aztec Example Development";
 				STRIP_INSTALLED_PRODUCT = NO;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Profiling;
@@ -909,7 +909,7 @@
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "Aztec Example Alpha Distribution";
 				STRIP_INSTALLED_PRODUCT = NO;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = "Release-Alpha";

diff --git a/Example/Example/EditorDemoController.swift b/Example/Example/EditorDemoController.swift
@@ -635,7 +635,7 @@ extension EditorDemoController {
             return OptionsTableViewOption(image: headerType.iconImage, title: title)
         }
 
-        let selectedIndex = Constants.headers.index(of: headerLevelForSelectedText())
+        let selectedIndex = Constants.headers.firstIndex(of: headerLevelForSelectedText())
         let optionsTableViewController = OptionsTableViewController(options: options)
         optionsTableViewController.cellDeselectedTintColor = .gray
 
@@ -665,7 +665,7 @@ extension EditorDemoController {
 
         var index: Int? = nil
         if let listType = listTypeForSelectedText() {
-            index = Constants.lists.index(of: listType)
+            index = Constants.lists.firstIndex(of: listType)
         }
 
         let optionsTableViewController = OptionsTableViewController(options: options)
@@ -1294,7 +1294,7 @@ private extension EditorDemoController
 
         let attachment = richTextView.replaceWithImage(at: richTextView.selectedRange, sourceURL: fileURL, placeHolderImage: image)
         attachment.size = .full
-        attachment.alignment = .none
+        attachment.alignment = ImageAttachment.Alignment.none
         if let attachmentRange = richTextView.textStorage.ranges(forAttachment: attachment).first {
             richTextView.setLink(fileURL, inRange: attachmentRange)
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -323,7 +323,7 @@ extension EditorView: UITextInput { @@
             }
             set {
-                activeView.selectedTextRange = selectedTextRange
+                activeView.selectedTextRange = newValue
             }
         }
     }
@@ Expand Down @@