wordpress-mobile · mokagio · Apr 16, 2024 · Nov 3, 2023 · Nov 4, 2023 · Nov 4, 2023
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -1,10 +1,10 @@
 # Nodes with values to reuse in the pipeline.
 common_params:
   plugins: &common_plugins
-    - automattic/a8c-ci-toolkit#2.13.0
+    - automattic/a8c-ci-toolkit#3.0.1
   # Common environment values to use with the `env` key.
   env: &common_env
-    IMAGE_ID: xcode-13
+    IMAGE_ID: xcode-15.0.1
 
 # This is the default pipeline – it will build and test the app
 steps:
@@ -24,9 +24,11 @@ steps:
   - label: "🔬 Validate Podspecs"
     key: "validate"
     command: |
-      validate_podspec
+      validate_podspec --patch-cocoapods
     env: *common_env
     plugins: *common_plugins
+    agents:
+      queue: mac
 
   #################
   # Lint

diff --git a/Aztec.xcodeproj/project.pbxproj b/Aztec.xcodeproj/project.pbxproj
@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		1A830346228583B200798076 /* NSBundle+AztecBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A830345228583B200798076 /* NSBundle+AztecBundle.swift */; };
+		247D2C662AF5B90900301B71 /* UIKit+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 247D2C652AF5B90900301B71 /* UIKit+Extensions.swift */; };
 		40359F261FD88A5F00B1C1D2 /* HRElementConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40359F251FD88A5F00B1C1D2 /* HRElementConverter.swift */; };
 		40359F281FD88A7900B1C1D2 /* BRElementConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40359F271FD88A7900B1C1D2 /* BRElementConverter.swift */; };
 		40A2986D1FD61B0C00AEDF3B /* ElementConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40A2986C1FD61B0C00AEDF3B /* ElementConverter.swift */; };
@@ -282,6 +283,7 @@
 
 /* Begin PBXFileReference section */
 		1A830345228583B200798076 /* NSBundle+AztecBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSBundle+AztecBundle.swift"; sourceTree = "<group>"; };
+		247D2C652AF5B90900301B71 /* UIKit+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIKit+Extensions.swift"; sourceTree = "<group>"; };
 		40359F251FD88A5F00B1C1D2 /* HRElementConverter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HRElementConverter.swift; sourceTree = "<group>"; };
 		40359F271FD88A7900B1C1D2 /* BRElementConverter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BRElementConverter.swift; sourceTree = "<group>"; };
 		40A2986C1FD61B0C00AEDF3B /* ElementConverter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ElementConverter.swift; sourceTree = "<group>"; };
@@ -343,7 +345,6 @@
 		B5E607321DA56EC700C8A389 /* TextListFormatterTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextListFormatterTests.swift; sourceTree = "<group>"; };
 		B5E94D0F1FE01334000E7C20 /* FigureElementConverter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FigureElementConverter.swift; sourceTree = "<group>"; };
 		B5F84B601E70595B0089A76C /* NSAttributedString+Analyzers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSAttributedString+Analyzers.swift"; sourceTree = "<group>"; };
-		B5F84B621E706B720089A76C /* NSAttributedStringAnalyzerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSAttributedStringAnalyzerTests.swift; sourceTree = "<group>"; };
 		E109B51B1DC33F2C0099605E /* LayoutManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LayoutManager.swift; sourceTree = "<group>"; };
 		E11B775F1DBA14B40024E455 /* BlockquoteFormatterTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BlockquoteFormatterTests.swift; sourceTree = "<group>"; };
 		F1000CE61EAA44AA0000B15B /* String+EndOfLine.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+EndOfLine.swift"; sourceTree = "<group>"; };
@@ -612,7 +613,6 @@
 				5951CB9B1D8BC93600E1866F /* AztecTests */,
 				599F255A1D8BCD97002871D6 /* Frameworks */,
 				5951CB8F1D8BC93600E1866F /* Products */,
-				F185A59D2123C07200DDFAB1 /* Recovered References */,
 			);
 			sourceTree = "<group>";
 		};
@@ -1053,6 +1053,7 @@
 				F15415F8213447D70096D18E /* TextViewStub.swift */,
 				B5D575851F2288E2003A62F6 /* TextViewStubAttachmentDelegate.swift */,
 				B52220D21F86A05400D7E092 /* TextViewStubDelegate.swift */,
+				247D2C652AF5B90900301B71 /* UIKit+Extensions.swift */,
 			);
 			path = TestingSupport;
 			sourceTree = "<group>";
@@ -1263,14 +1264,6 @@
 			path = Conversions;
 			sourceTree = "<group>";
 		};
-		F185A59D2123C07200DDFAB1 /* Recovered References */ = {
-			isa = PBXGroup;
-			children = (
-				B5F84B621E706B720089A76C /* NSAttributedStringAnalyzerTests.swift */,
-			);
-			name = "Recovered References";
-			sourceTree = "<group>";
-		};
 		F185A5A02123C0D900DDFAB1 /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
@@ -1709,6 +1702,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				247D2C662AF5B90900301B71 /* UIKit+Extensions.swift in Sources */,
 				F185A5B52123C0DA00DDFAB1 /* NSMutableAttributedStringReplaceOcurrencesTests.swift in Sources */,
 				B5D575891F2288E2003A62F6 /* TextViewTests.swift in Sources */,
 				594C9D741D8BE6C700D74542 /* InNodeConverterTests.swift in Sources */,
@@ -1832,7 +1826,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = /usr/include/libxml2;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-lxml2";
@@ -1894,7 +1888,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = /usr/include/libxml2;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = "-lxml2";
 				SDKROOT = iphoneos;
@@ -1922,7 +1916,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Aztec/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MARKETING_VERSION = 1.15.0;
 				PRODUCT_BUNDLE_IDENTIFIER = org.wordpress.Aztec;
@@ -1949,7 +1943,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Aztec/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MARKETING_VERSION = 1.15.0;
 				PRODUCT_BUNDLE_IDENTIFIER = org.wordpress.Aztec;
@@ -2038,7 +2032,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = /usr/include/libxml2;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-lxml2";
@@ -2066,7 +2060,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Aztec/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MARKETING_VERSION = 1.15.0;
 				PRODUCT_BUNDLE_IDENTIFIER = org.wordpress.Aztec;
@@ -2145,7 +2139,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = /usr/include/libxml2;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-lxml2";
@@ -2174,7 +2168,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Aztec/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MARKETING_VERSION = 1.15.0;
 				PRODUCT_BUNDLE_IDENTIFIER = org.wordpress.Aztec;

diff --git a/Aztec/Classes/EditorView/EditorView.swift b/Aztec/Classes/EditorView/EditorView.swift
@@ -41,18 +41,17 @@ public class EditorView: UIView {
             richTextView.contentOffset = newValue
         }
     }
-    
-    public var scrollIndicatorInsets: UIEdgeInsets {
+
+    public var horizontalScrollIndicatorInsets: UIEdgeInsets {
         get {
-            return activeView.scrollIndicatorInsets
+            return activeView.horizontalScrollIndicatorInsets
         }
-
         set {
-            htmlTextView.scrollIndicatorInsets = newValue
-            richTextView.scrollIndicatorInsets = newValue
+            htmlTextView.horizontalScrollIndicatorInsets = newValue
+            richTextView.horizontalScrollIndicatorInsets = newValue
         }
     }
-    
+
     // MARK: - Editing Mode
 
     public enum EditMode {

diff --git a/Aztec/Classes/Extensions/NSAttributedString+Archive.swift b/Aztec/Classes/Extensions/NSAttributedString+Archive.swift
@@ -6,14 +6,12 @@ extension NSAttributedString
 {
     static let pastesboardUTI = "com.wordpress.aztec.attributedString"
 
-    func archivedData() -> Data {
-        let data = NSKeyedArchiver.archivedData(withRootObject: self)
-        return data
+    func archivedData() throws -> Data {
+        return try NSKeyedArchiver.archivedData(withRootObject: self, requiringSecureCoding: false)
     }
 
-    static func unarchive(with data: Data) -> NSAttributedString? {
-        let attributedString = NSKeyedUnarchiver.unarchiveObject(with: data) as? NSAttributedString
-        return attributedString
+    static func unarchive(with data: Data) throws -> NSAttributedString? {
+        return try NSKeyedUnarchiver.unarchivedObject(ofClass: NSAttributedString.self, from: data)
     }
 
 }
diff --git a/Aztec/Classes/Extensions/NSAttributedString+Attachments.swift b/Aztec/Classes/Extensions/NSAttributedString+Attachments.swift
@@ -99,8 +99,7 @@ extension NSAttributedString
     }
 
     // MARK: - Captions
-
-    open func caption(for attachment: NSTextAttachment) -> NSAttributedString? {
+    public func caption(for attachment: NSTextAttachment) -> NSAttributedString? {
         guard let captionRange = self.captionRange(for: attachment) else {
             return nil
         }

diff --git a/Aztec/Classes/Extensions/String+RangeConversion.swift b/Aztec/Classes/Extensions/String+RangeConversion.swift
@@ -89,6 +89,10 @@ public extension String {
     ///
     private func findValidLowerBound(for utf16Range: Range<String.UTF16View.Index>) -> String.Index {
 
+        guard isValidRange(utf16Range) else {
+            return String.UTF16View.Index(utf16Offset: 0, in: self)
+        }
+
         guard self.utf16.count >= utf16Range.lowerBound.utf16Offset(in: self) else {
             return String.UTF16View.Index(utf16Offset: 0, in: self)
         }
@@ -106,6 +110,10 @@ public extension String {
     ///
     private func findValidUpperBound(for utf16Range: Range<String.UTF16View.Index>) -> String.Index {
 
+        guard isValidRange(utf16Range) else {
+            return String.Index(utf16Offset: self.utf16.count, in: self)
+        }
+
         guard self.utf16.count >= utf16Range.upperBound.utf16Offset(in: self) else {
             return String.Index(utf16Offset: self.utf16.count, in: self)
         }
@@ -241,4 +249,12 @@ public extension String {
 
         return startIndex ..< endIndex
     }
+
+    func isValidRange(_ range: Range<String.UTF16View.Index>) -> Bool {
+        isValidIndex(range.lowerBound) && isValidIndex(range.upperBound)
+    }
+
+    func isValidIndex(_ index: String.UTF16View.Index) -> Bool {
+        (self.startIndex ..< self.endIndex).contains(index)
+    }
 }
diff --git a/Aztec/Classes/Extensions/StringUTF16+RangeConversion.swift b/Aztec/Classes/Extensions/StringUTF16+RangeConversion.swift
@@ -12,6 +12,11 @@ extension String.UTF16View {
     func range(from nsRange: NSRange) -> Range<String.UTF16View.Index> {
         let start = index(startIndex, offsetBy: nsRange.location)
         let offset = count < nsRange.length ? count : nsRange.length
+
+        guard nsRange.length > 0 else {
+            return start ..< start
+        }
+
         let end = index(start, offsetBy: offset)
 
         return start ..< end

diff --git a/Aztec/Classes/Extensions/UIColor+Parsers.swift b/Aztec/Classes/Extensions/UIColor+Parsers.swift
@@ -8,11 +8,11 @@ public extension UIColor {
     convenience init?(hexString: String) {
 
         let hex = hexString.trimmingCharacters(in: CharacterSet.alphanumerics.inverted)
-        var int = UInt32()
-        if !Scanner(string: hex).scanHexInt32(&int) {
+        var int = UInt64()
+        if !Scanner(string: hex).scanHexInt64(&int) {
             return nil
         }
-        let a, r, g, b: UInt32
+        let a, r, g, b: UInt64
         switch hex.count {
         case 3: // RGB (12-bit)
             (a, r, g, b) = (255, (int >> 8) * 17, (int >> 4 & 0xF) * 17, (int & 0xF) * 17)

diff --git a/Aztec/Classes/Extensions/UIPasteboard+Helpers.swift b/Aztec/Classes/Extensions/UIPasteboard+Helpers.swift
@@ -51,7 +51,7 @@ private extension UIPasteboard {
             return nil
         }
 
-        return NSAttributedString.unarchive(with: data)
+        return try? NSAttributedString.unarchive(with: data)
     }
 
     /// Attempts to unarchive the Pasteboard's Plain Text contents into an Attributed String

diff --git a/Aztec/Classes/TextKit/TextStorage.swift b/Aztec/Classes/TextKit/TextStorage.swift
@@ -402,6 +402,11 @@ open class TextStorage: NSTextStorage {
         }
     }
 
+    // MARK: – Plain Text Interaction
+    open func getPlainText(range: NSRange) -> String {
+        self.attributedSubstring(from: range).string
+    }
+
     // MARK: - HTML Interaction
 
     open func getHTML(prettify: Bool = false) -> String {